@@ -100,10 +100,15 @@
     ;; DOT INIT_RUNREMOTE -> MUTEXLOCK;
     ;; ensure we have a record for our connection for given area
     (if (not runremote)                   ;; can remove this one. should never get here.         
 	(begin
 	  (set! *runremote* (make-remote))
+          (let* ((server-info (remote-server-info *runremote*))) 
+            (if server-info
+		(begin
+			(remote-server-url-set! *runremote* (server:record->url server-info))
+			(remote-server-id-set! *runremote* (server:record->id server-info)))))  
 	  (set! runremote   *runremote*))) ;; new runremote will come from this on next iteration
     
     ;; DOT SET_HOMEHOST; // leaving off - doesn't really add to the clarity
     ;; DOT MUTEXLOCK -> SET_HOMEHOST [label="no homehost?"];
     ;; DOT SET_HOMEHOST -> MUTEXLOCK;
@@ -174,12 +179,17 @@
      ;;DOT CASE6 -> "rmt:send-receive";
      ;; on homehost and this is a write, we already have a server, but server has died
      ((and (cdr (remote-hh-dat runremote))           ;; on homehost
            (not (member cmd api:read-only-queries))  ;; this is a write
            (remote-server-url runremote)             ;; have a server
-           (not (server:ping (remote-server-url runremote))))  ;; server has died. NOTE: this is not a cheap call! Need better approach.
+           (not (server:ping (remote-server-url runremote) (remote-server-id runremote))))  ;; server has died. NOTE: this is not a cheap call! Need better approach.
       (set! *runremote* (make-remote))
+      (let* ((server-info (remote-server-info *runremote*))) 
+            (if server-info
+		(begin
+		  (remote-server-url-set! *runremote* (server:record->url server-info))
+                  (remote-server-id-set! *runremote* (server:record->id server-info)))))
       (remote-force-server-set! runremote (common:force-server?))
       (mutex-unlock! *rmt-mutex*)
       (debug:print-info 12 *default-log-port* "rmt:send-receive, case  6")
       (rmt:send-receive cmd rid params attemptnum: attemptnum))
 
@@ -202,20 +212,22 @@
      ((and (not (remote-force-server runremote))     ;; honor forced use of server, i.e. server NOT required
 	   (cdr (remote-hh-dat runremote))           ;; have homehost
            (not (remote-server-url runremote))       ;; no connection yet
 	   (not (member cmd api:read-only-queries))) ;; not a read-only query
       (debug:print-info 12 *default-log-port* "rmt:send-receive, case  8")
-      (let ((server-url  (server:check-if-running *toppath*))) ;; (server:read-dotserver->url *toppath*))) ;; (server:check-if-running *toppath*))) ;; Do NOT want to run server:check-if-running - very expensive to do for every write call
-	(if server-url
-	    (remote-server-url-set! runremote server-url) ;; the string can be consumed by the client setup if needed
+      (let ((server-info  (server:check-if-running *toppath*))) ;; (server:read-dotserver->url *toppath*))) ;; (server:check-if-running *toppath*))) ;; Do NOT want to run server:check-if-running - very expensive to do for every write call
+	(if server-info
+	    (begin
+              (remote-server-url-set! runremote (server:record->url server-info)) ;; the string can be consumed by the client setup if needed
+              (remote-server-id-set! runremote (server:record->id server-info)))  
 	    (if (common:force-server?)
 		(server:start-and-wait *toppath*)
-		(server:kind-run *toppath*))))
+		(server:kind-run *toppath*)))
       (remote-force-server-set! runremote (common:force-server?))
       (mutex-unlock! *rmt-mutex*)
       (debug:print-info 12 *default-log-port* "rmt:send-receive, case  8.1")
-      (rmt:open-qry-close-locally cmd 0 params))
+      (rmt:open-qry-close-locally cmd 0 params)))
 
      ;;DOT CASE9 [label="force server\nnot on homehost"];
      ;;DOT MUTEXLOCK -> CASE9 [label="no connection\nand either require server\nor not on homehost"]; {rank=same "case 9" CASE9};
      ;;DOT CASE9 -> "start\nserver" -> "rmt:send-receive";
      ((or (and (remote-force-server runremote)              ;; we are forcing a server and don't yet have a connection to one