diff --git a/hmml_to_html/mock_filter.html b/hmml_to_html/mock_filter.html
index 7070aaa..200b85b 100644
--- a/hmml_to_html/mock_filter.html
+++ b/hmml_to_html/mock_filter.html
@@ -288,32 +288,28 @@ for(var i = 0; i < filterTopics.length; ++i)
             this.classList.add("off");
             for(var j = 0; j < testMarkers.length; ++j)
             {
-                var categorisedMarkers = testMarkers[j].querySelectorAll("." + selectedCategory);
-                for(var k = 0; k < categorisedMarkers.length; ++k)
+                var Skipping = 1;
+                var markerCategories = testMarkers[j].querySelectorAll(".category");
+                for(var k = 0; k < markerCategories.length; ++k)
                 {
-                    var Skipping = 1;
-                    categorisedMarkers[k].classList.add("off");
+                    if(markerCategories[k].classList.contains(selectedCategory))
+                    {
+                        markerCategories[k].classList.add("off");
+                    }
+
                     if(filterMode == "exclusive")
                     {
                         testMarkers[j].classList.add("skip");
                     }
-                    else
+                    else if(!markerCategories[k].classList.contains("off"))
                     {
-                        var markerCategories = testMarkers[j].querySelectorAll(".category");
-                        for(var l = 0; l < markerCategories.length; ++l)
-                        {
-                            if(!markerCategories[l].classList.contains("off"))
-                            {
-                                Skipping = 0;
-                            }
-
-                        }
-                        if(Skipping)
-                        {
-                            testMarkers[j].classList.add("skip");
-                        }
+                        Skipping = 0;
                     }
                 }
+                if(Skipping)
+                {
+                    testMarkers[j].classList.add("skip");
+                }
             }
         }
         else
@@ -321,32 +317,28 @@ for(var i = 0; i < filterTopics.length; ++i)
             this.classList.remove("off");
             for(var j = 0; j < testMarkers.length; ++j)
             {
-                var categorisedMarkers = testMarkers[j].querySelectorAll("." + selectedCategory);
-                for(var k = 0; k < categorisedMarkers.length; ++k)
+                var Skipping = 0;
+                var markerCategories = testMarkers[j].querySelectorAll(".category");
+                for(var k = 0; k < markerCategories.length; ++k)
                 {
-                    var Skipping = 0;
-                    categorisedMarkers[k].classList.remove("off");
+                    if(markerCategories[k].classList.contains(selectedCategory))
+                    {
+                        markerCategories[k].classList.remove("off");
+                    }
+
                     if(filterMode == "inclusive")
                     {
                         testMarkers[j].classList.remove("skip");
                     }
-                    else
+                    else if(markerCategories[k].classList.contains("off"))
                     {
-                        var markerCategories = testMarkers[j].querySelectorAll(".category");
-                        for(var l = 0; l < markerCategories.length; ++l)
-                        {
-                            if(markerCategories[l].classList.contains("off"))
-                            {
-                                Skipping = 1;
-                            }
-
-                        }
-                        if(!Skipping)
-                        {
-                            testMarkers[j].classList.remove("skip");
-                        }
+                        Skipping = 1;
                     }
                 }
+                if(!Skipping)
+                {
+                    testMarkers[j].classList.remove("skip");
+                }
             }
         }
     });