diff --git a/OnTopReplica/WindowSeekers/PointBasedWindowSeeker.cs b/OnTopReplica/WindowSeekers/PointBasedWindowSeeker.cs
index 92241f7..2c798dc 100644
--- a/OnTopReplica/WindowSeekers/PointBasedWindowSeeker.cs
+++ b/OnTopReplica/WindowSeekers/PointBasedWindowSeeker.cs
@@ -26,6 +26,7 @@ namespace OnTopReplica.WindowSeekers {
 
             //Sort and store
             _currentWindowList = (from t in _sortingList
+                                  where t.Item1 > 0
                                   orderby t.Item1 descending
                                   select t.Item2).ToList();
 
diff --git a/OnTopReplica/WindowSeekers/RestoreWindowSeeker.cs b/OnTopReplica/WindowSeekers/RestoreWindowSeeker.cs
index 5c06e05..ce4cbf8 100644
--- a/OnTopReplica/WindowSeekers/RestoreWindowSeeker.cs
+++ b/OnTopReplica/WindowSeekers/RestoreWindowSeeker.cs
@@ -32,7 +32,7 @@ namespace OnTopReplica.WindowSeekers {
             //Class exact match
             if (!string.IsNullOrEmpty(Class)) {
                 string wndClass = handle.Class;
-                if (wndClass.StartsWith(Class, StringComparison.InvariantCulture)){
+                if (wndClass.Equals(Class, StringComparison.InvariantCulture)){
                     points += 10;
                 }
             }
@@ -40,10 +40,10 @@ namespace OnTopReplica.WindowSeekers {
             //Title match (may not be exact, but let's try)
             if (!string.IsNullOrEmpty(Title) && !string.IsNullOrEmpty(handle.Title)) {
                 if (handle.Title.StartsWith(Title, StringComparison.InvariantCultureIgnoreCase)) {
-                    points += 10;
+                    points += 5;
                 }
                 if (handle.Title.Equals(Title, StringComparison.InvariantCultureIgnoreCase)) {
-                    points += 5;
+                    points += 10;
                 }
             }