@@ -559,11 +559,11 @@
   (let ((res '()))
     (sqlite3:for-each-row 
      (lambda (id test_id category variable value expected tol units comment status)
        (set! res (cons res (vector id test_id category variable value expected tol units comment status))))
      db
-     "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status FROM test_data WHERE test_id=? AND category LIKE ?;" test-id categorypatt)
+     "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt)
     (reverse res)))
 
 (define (db:load-test-data db run-id test-name itemdat)
   (let* ((item-path (item-list->path itemdat))
 	 (testdat (db:get-test-info db run-id test-name item-path))
@@ -689,21 +689,22 @@
 				      (debug:print 4 "record[1]=" (vector-ref record 1) 
 						   ", startt=" startt ", endt=" endt
 						   ", get-status: " (db:step-get-status step))
 				      (if (and (number? startt)(number? endt))
 					  (seconds->hr-min-sec (- endt startt)) "-1"))))
-	     (else   (vector-set! record 1 (db:step-get-event_time step))))
-	   (vector-set! record 2 (db:step-get-state step))
-	   (vector-set! record 3 (db:step-get-status step))
-	   (vector-set! record 4 (db:step-get-event_time step))
+	     (else
+	        (vector-set! record 2 (db:step-get-state step))
+	        (vector-set! record 3 (db:step-get-status step))
+	        (vector-set! record 4 (db:step-get-event_time step))))
 	   (hash-table-set! res (db:step-get-stepname step) record)
 	   (debug:print 6 "record(after)  = " record 
 			"\nid:       " (db:step-get-id step)
 			"\nstepname: " (db:step-get-stepname step)
 			"\nstate:    " (db:step-get-state step)
 			"\nstatus:   " (db:step-get-status step)
 			"\ntime:     " (db:step-get-event_time step))))
+       ;; (else   (vector-set! record 1 (db:step-get-event_time step)))
        (sort steps (lambda (a b)(< (db:step-get-event_time a)(db:step-get-event_time b)))))
       res)))
 
 ;; USE: (lset-difference string=? '("a" "b" "c") '("d" "c" "e" "a"))
 ;;