@@ -1067,11 +1067,11 @@
     ;;
     (dboard:tabdat-all-test-names-set!
      tabdat
      (collapse-rows
       tabdat
-      (sort (hash-table-keys all-test-names) string>?))) ;; FIXME: Sorting needs to happen here
+      (sort (filter string? (hash-table-keys all-test-names)) string>?))) ;; FIXME: Sorting needs to happen here
 
     ;; Trim the names list to fit the matrix of buttons
     ;;
     (dboard:tabdat-all-test-names-set!
      tabdat
@@ -2864,11 +2864,11 @@
 			   ((external) ;; was tabs
 			    (let ((tab-content (dboard:add-external-tab commondat view-name views-cfgdat #f tab-num)))
 			      (set! additional-tabnames (cons (cons tab-num view-name) additional-tabnames))
 			      (set! tab-num (+ tab-num 1))
 			      (set! result (append result (list tab-content)))))))))
-		 (sort (hash-table-keys views-cfgdat)
+		 (sort (configf:get-sections views-cfgdat) ;; (hash-table-keys views-cfgdat)
 		       (lambda (a b)
 			 (let ((order-a (or (any->number (configf:lookup views-cfgdat a "order")) 999))
 			       (order-b (or (any->number (configf:lookup views-cfgdat b "order")) 999)))
 			   (> order-a order-b)))))
 		result))