diff --git a/TeamDBAwesome/TeamDBAwesome/Controllers/SearchController.cs b/TeamDBAwesome/TeamDBAwesome/Controllers/SearchController.cs
index 6f7285a..cef2887 100644
--- a/TeamDBAwesome/TeamDBAwesome/Controllers/SearchController.cs
+++ b/TeamDBAwesome/TeamDBAwesome/Controllers/SearchController.cs
@@ -26,6 +26,9 @@ public HttpResponseMessage Get(string search="")
             MatchCollection m = regex.Matches(search);
             Debug.WriteLine(m);
             Search dbsearch = new Search();
+
+            string searchkey = search;
+
             if(m.Count > 0)
             {
                 //set each one to blank first
@@ -36,15 +39,23 @@ public HttpResponseMessage Get(string search="")
                 dbsearch.Composer = "";
                 dbsearch.Genre = "";
 
+                foreach (Match match in m)
+                {
+                    searchkey = searchkey.Replace(match.Value, "");
+                }
+
+                searchkey = searchkey.Trim();
+
                 foreach (Match match in m)
                 {
                     string tag = match.Value.Split(':')[1];
-                    if (tag == "Media") { dbsearch.Media = search; }
-                    else if (tag == "Album") { dbsearch.Album = search; }
-                    else if (tag == "Artist") { dbsearch.Artist = search; }
-                    else if (tag == "Track") { dbsearch.Track = search; }
-                    else if (tag == "Composer") { dbsearch.Composer = search; }
-                    else if (tag == "Genre") { dbsearch.Genre = search; }
+
+                    if (tag == "Media") { dbsearch.Media = searchkey; }
+                    else if (tag == "Album") { dbsearch.Album = searchkey; }
+                    else if (tag == "Artist") { dbsearch.Artist = searchkey; }
+                    else if (tag == "Track") { dbsearch.Track = searchkey; }
+                    else if (tag == "Composer") { dbsearch.Composer = searchkey; }
+                    else if (tag == "Genre") { dbsearch.Genre = searchkey; }
                 }
             }
             else