@@ -464,61 +464,28 @@
 	   ;; (iup:button "Down   v" #:action (lambda (obj)(set! *start-test-offset* (if (>= *start-test-offset* (length *alltestnamelst*))(length *alltestnamelst*)(+ *start-test-offset* 1)))))
 	   ;; (iup:button "Right ->" #:action (lambda (obj)(set! *start-run-offset*  (if (> *start-run-offset* 0)(- *start-run-offset* 1) 0))))
 	   (iup:frame 
 	    #:title "hide"
 	    (iup:vbox
-	     (iup:hbox
-	      (iup:toggle "PASS"  #:action   (lambda (obj val)
-					       (if (eq? val 1)
-						   (hash-table-set! *status-ignore-hash* "PASS" #t)
-						   (hash-table-delete! *status-ignore-hash* "PASS"))))
-	      (iup:toggle "FAIL"   #:action   (lambda (obj val)
-						(if (eq? val 1)
-						    (hash-table-set! *status-ignore-hash* "FAIL" #t)
-						    (hash-table-delete! *status-ignore-hash* "FAIL"))))
-	      (iup:toggle "WARN"   #:action   (lambda (obj val)
-						(if (eq? val 1)
-						    (hash-table-set! *status-ignore-hash* "WARN" #t)
-						    (hash-table-delete! *status-ignore-hash* "WARN"))))
-	      (iup:toggle "CHECK"   #:action   (lambda (obj val)
-                                                  (if (eq? val 1)
-                                                      (hash-table-set! *status-ignore-hash* "CHECK" #t)
-                                                      (hash-table-delete! *status-ignore-hash* "CHECK"))))
-              (iup:toggle "WAIVED"   #:action   (lambda (obj val)
-						  (if (eq? val 1)
-						      (hash-table-set! *status-ignore-hash* "WAIVED" #t)
-						      (hash-table-delete! *status-ignore-hash* "WAIVED"))))
-	      (iup:toggle "STUCK/DEAD"   #:action   (lambda (obj val)
-						  (if (eq? val 1)
-						      (hash-table-set! *status-ignore-hash* "STUCK/DEAD" #t)
-						      (hash-table-delete! *status-ignore-hash* "STUCK/DEAD"))))
-	      )
-	     (iup:hbox
-	      (iup:toggle "RUNNING"   #:action   (lambda (obj val)
-						   (if (eq? val 1)
-						       (hash-table-set! *state-ignore-hash* "RUNNING" #t)
-						       (hash-table-delete! *state-ignore-hash* "RUNNING"))))
-	      (iup:toggle "COMPLETED"   #:action   (lambda (obj val)
-						     (if (eq? val 1)
-							 (hash-table-set! *state-ignore-hash* "COMPLETED" #t)
-							 (hash-table-delete! *state-ignore-hash* "COMPLETED"))))
-	      (iup:toggle "INCOMPLETE"   #:action   (lambda (obj val)
-						     (if (eq? val 1)
-							 (hash-table-set! *state-ignore-hash* "INCOMPLETE" #t)
-							 (hash-table-delete! *state-ignore-hash* "INCOMPLETE"))))
-	      (iup:toggle "LAUNCHED"   #:action   (lambda (obj val)
-						     (if (eq? val 1)
-							 (hash-table-set! *state-ignore-hash* "LAUNCHED" #t)
-							 (hash-table-delete! *state-ignore-hash* "LAUNCHED"))))
-	      (iup:toggle "NOT_STARTED"   #:action   (lambda (obj val)
-						     (if (eq? val 1)
-							 (hash-table-set! *state-ignore-hash* "NOT_STARTED" #t)
-							 (hash-table-delete! *state-ignore-hash* "NOT_STARTED"))))
-	      (iup:toggle "KILLED"   #:action   (lambda (obj val)
-						  (if (eq? val 1)
-						      (hash-table-set! *state-ignore-hash* "KILLED" #t)
-						      (hash-table-delete! *state-ignore-hash* "KILLED")))))))
+	     (apply 
+	      iup:hbox
+	      (map (lambda (status)
+		     (iup:toggle status  #:action   (lambda (obj val)
+						      (set! *last-db-update-time* 0)
+						      (if (eq? val 1)
+							  (hash-table-set! *status-ignore-hash* status #t)
+							  (hash-table-delete! *status-ignore-hash* status)))))
+	      '("PASS" "FAIL" "WARN" "CHECK" "WAIVED" "STUCK/DEAD")))
+	     (apply 
+	      iup:hbox
+	      (map (lambda (state)
+		     (iup:toggle state   #:action   (lambda (obj val)
+						      (set! *last-db-update-time* 0)
+						      (if (eq? val 1)
+							  (hash-table-set! *state-ignore-hash* state #t)
+							  (hash-table-delete! *state-ignore-hash* state)))))
+		   '("RUNNING" "COMPLETED" "INCOMPLETE" "LAUNCHED" "NOT_STARTED" "KILLED")))))
 	   (iup:valuator #:valuechanged_cb (lambda (obj)
 					     (let ((val (inexact->exact (round (+ 0.0 (string->number (iup:attribute obj "VALUE"))))))
 						   (maxruns  *tot-run-count*)) ;;; (+ *num-runs* (length *allruns*))))
 					       (set! *start-run-offset* val)
 					       (set! *last-db-update-time* 0)