@@ -54,18 +54,39 @@
 		  (client:setup areapath)
 		  #f))))
 
 (define *send-receive-mutex* (make-mutex)) ;; should have separate mutex per run-id
 
+(define *rmt-query-last-call-time* 0)
+(define *rmt-query-last-rest-time* 0) ;; last time there was at least a 1/2 second rest - giving other processes access to the db
+
+;; NOTE: This query rest algorythm will not adapt to long query times. REDESIGN NEEDED. TODO. FIXME.
+;;
+(define (rmt:query-rest)
+  (let* ((now (current-milliseconds)))
+    (cond
+     ((> (- now *rmt-query-last-call-time*) 500)  ;; it's been a while since last query - no need to rest
+      (set! *rmt-query-last-rest-time*  now)
+      (set! *rmt-query-last-call-time*  now))
+     ((> (- now *rmt-query-last-rest-time*) 5000) ;; no natural rests have happened
+      (debug:print 0 *default-log-port* "query rest needed. blocking for 1/2 second.")
+      (thread-sleep! 0.5) ;; force a rest of a half second
+      (set! *rmt-query-last-rest-time* now)
+      (set! *rmt-query-last-call-time* now))
+     (else ;; sufficient rests have occurred, just record the last query time
+      (set! *rmt-query-last-call-time* now)))))
+
 ;; RA => e.g. usage (rmt:send-receive 'get-var #f (list varname))
 ;;
 (define (rmt:send-receive cmd rid params #!key (attemptnum 1)(area-dat #f)) ;; start attemptnum at 1 so the modulo below works as expected
 
   #;(common:telemetry-log (conc "rmt:"(->string cmd))
                         payload: `((rid . ,rid)
                                    (params . ,params)))
-                          
+  (if (not (equal? (configf:lookup *configdat* "setup" "query-rest") "no"))
+      (rmt:query-rest))
+  
   (if (> attemptnum 2)
       (debug:print 0 *default-log-port* "INFO: attemptnum in rmt:send-receive is " attemptnum))
     
   (cond
    ((> attemptnum 2) (thread-sleep! 0.05))
@@ -369,12 +390,12 @@
 					 (> (vector-length v) 1))
 				    (let ((newvec (vector (vector-ref v 0)(vector-ref v 1))))
 				      newvec)           ;; by copying the vector while inside the error handler we should force the detection of a corrupted record
 				    (vector #t '()))))  ;; we could also check that the returned types are valid
 			     (vector #t '())))
-	 (success        (vector-ref resdat 0))
-	 (res            (vector-ref resdat 1))
+	 (success        (common:safe-vector-ref resdat 0 #f)) ;; (vector-ref resdat 0))
+	 (res            (common:safe-vector-ref resdat 1 #f)) ;; (vector-ref resdat 1))
 	 (duration       (- (current-milliseconds) start)))
     (if (and read-only qry-is-write)
         (debug:print 0 *default-log-port* "ERROR: attempt to write to read-only database ignored. cmd=" cmd))
     (if (not success)
 	(if (> remretries 0)
@@ -389,11 +410,11 @@
 	  ;; (rmt:update-db-stats run-id cmd params duration)
 	  ;; mark this run as dirty if this was a write, the watchdog is responsible for syncing it
 	  (if qry-is-write
 	      (let ((start-time (current-seconds)))
 		(mutex-lock! *db-multi-sync-mutex*)
-/		(set! *db-last-access* start-time)  ;; THIS IS PROBABLY USELESS? (we are on a client)
+		(set! *db-last-access* start-time)  ;; THIS IS PROBABLY USELESS? (we are on a client)
                 (mutex-unlock! *db-multi-sync-mutex*)))))
     res))
 
 (define (rmt:send-receive-no-auto-client-setup connection-info cmd run-id params)
   (let* ((run-id   (if run-id run-id 0))