diff --git a/EduNetworkBuilder/ListBoxWindow.cs b/EduNetworkBuilder/ListBoxWindow.cs
index 2803fd4..85eff67 100644
--- a/EduNetworkBuilder/ListBoxWindow.cs
+++ b/EduNetworkBuilder/ListBoxWindow.cs
@@ -56,7 +56,8 @@ namespace EduNetworkBuilder
         string TestString = "Test";
         string NoTestString = "No Test";
         string PassedString = "Passed";
-        string FailedString = "Failed;";
+        string FailedString = "Failed";
+        string Untested = "Untested";
         public bool ClosingRegression = false;
 
 
@@ -158,6 +159,7 @@ namespace EduNetworkBuilder
                 newCB = AddCheckBox(count++, NoTestString);
                 newCB = AddCheckBox(count++, PassedString);
                 newCB = AddCheckBox(count++, FailedString);
+                newCB = AddCheckBox(count++, Untested);
 
                 panelCheckboxes.ResumeLayout();
                 btnOK.Text = NB.Translate("_Load");
@@ -422,6 +424,10 @@ namespace EduNetworkBuilder
                     else tags.Add(NoTestString);
                     if (oursettings.HasPassed(puzzle_name)) tags.Add(PassedString);
                     if (oursettings.HasFailed(puzzle_name)) tags.Add(FailedString);
+                    if (oursettings.HasPassed(puzzle_name)) tags.Add(PassedString);
+                    if (!oursettings.HasFailed(puzzle_name) && !oursettings.HasPassed(puzzle_name) 
+                        && oursettings.HasReplay(puzzle_name))
+                        tags.Add(Untested);
                     foreach (string tag in tags)
                     {
                         if (isChecked(tag))
@@ -443,7 +449,7 @@ namespace EduNetworkBuilder
                 }
                 if (selected != null && selected != "")
                 {
-                    if(selectedIndex >=0 && selectedIndex <= lbWindowData.Items.Count)
+                    if(selectedIndex >=0 && selectedIndex < lbWindowData.Items.Count)
                         lbWindowData.SelectedIndex = selectedIndex;
                 }
                 if (lbWindowData.SelectedIndex != -1)