@@ -31,10 +31,11 @@
 (declare (uses runs))
 (declare (uses dashboard-tests))
 (declare (uses dashboard-guimonitor))
 ;; (declare (uses dashboard-main))
 (declare (uses megatest-version))
+(declare (uses mt))
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 
@@ -100,12 +101,13 @@
 (define dlg      #f)
 (define max-test-num 0)
 ;; (define *keys*   (open-run-close db:get-keys #f))
 (define *keys*   (cdb:remote-run db:get-keys #f))
 ;; (define *keys*   (db:get-keys   *db*))
-(define *dbkeys*  (map (lambda (x)(vector-ref x 0))
-		      (append *keys* (list (vector "runname" "blah")))))
+
+(define *dbkeys*  (append *keys* (list "runname")))
+
 (define *header*       #f)
 (define *allruns*     '())
 (define *allruns-by-id* (make-hash-table)) ;; 
 (define *runchangerate* (make-hash-table))
 
@@ -199,15 +201,14 @@
 		(begin
 		  (set! *last-update* (current-seconds))
 		  (set! *tot-run-count* (length runs))))
 	    ;; 
 	    ;; trim runs to only those that are changing often here
-
 	    ;; 
 	    (for-each (lambda (run)
 			(let* ((run-id   (db:get-value-by-header run header "id"))
-			       (tests    (let ((tsts (cdb:remote-run db:get-tests-for-run #f run-id testnamepatt states statuses)))
+			       (tests    (let ((tsts (mt:get-tests-for-run run-id testnamepatt states statuses)))
 					   (if *tests-sort-reverse* (reverse tsts) tsts)))
 			       (key-vals (cdb:remote-run db:get-key-vals #f run-id)))
 			  ;; Not sure this is needed?
 			  (set! referenced-run-ids (cons run-id referenced-run-ids))
 			  (if (> (length tests) maxtests)