diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index fdd5fc2..c2f6711 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -220,7 +220,7 @@ namespace EnvyUpdate
             foreach (var name in names) // Looping through the XML Doc because the name is not the primary key
             {
                 string sName = name.Value.ToString().ToLower();
-                if (sName == query)
+                if (sName.Contains(query))
                 {
                     Debug.LogToFile("INFO Matched GetValueFromName query: " + sName);
                     string cleanResult = null;
@@ -335,7 +335,7 @@ namespace EnvyUpdate
                     {
                         GPUName = obj["VideoProcessor"].ToString().ToLower();
                         // Remove any 3GB, 6GB or similar from name. We don't need to know the VRAM to get results.
-                        GPUName = Regex.Match(GPUName, "(geforce )?.tx \\w*\\d*( ti)?").Value;
+                        GPUName = Regex.Match(GPUName, "(geforce )((.tx )|(mx))?\\w*\\d*( ti)?").Value;
                     }
                     else
                         GPUName = obj["VideoProcessor"].ToString();