diff --git a/src/music_controller/music_controller.rs b/src/music_controller/music_controller.rs
index cb39ded..9455e58 100644
--- a/src/music_controller/music_controller.rs
+++ b/src/music_controller/music_controller.rs
@@ -85,6 +85,6 @@ impl MusicController {
         sort_by: Vec<Tag>,
     ) -> Option<Vec<&Song>> {
         self.library
-            .query(query_string, &target_tags, &sort_by)
+            .query_tracks(query_string, &target_tags, &sort_by)
     }
 }
diff --git a/src/music_storage/music_db.rs b/src/music_storage/music_db.rs
index 7d325e3..0e02d49 100644
--- a/src/music_storage/music_db.rs
+++ b/src/music_storage/music_db.rs
@@ -664,7 +664,7 @@ impl MusicLibrary {
     ///
     /// Example:
     /// ```
-    /// query(
+    /// query_tracks(
     ///     &String::from("query"),
     ///     &vec![
     ///         Tag::Title
@@ -680,7 +680,7 @@ impl MusicLibrary {
     /// This would find all titles containing the sequence
     /// "query", and would return the results sorted first
     /// by path, then album, disk number, and finally track number.
-    pub fn query(
+    pub fn query_tracks(
         &self,
         query_string: &String,  // The query itself
         target_tags: &Vec<Tag>, // The tags to search
@@ -773,7 +773,7 @@ impl MusicLibrary {
                 None => continue
             };
 
-            match albums.binary_search_by_key(&normalize(&title), |album| normalize(&album.title.to_owned())) {
+            match albums.binary_search_by_key(&title, |album| album.title) {
                 Ok(pos) => {
                     albums[pos].tracks.push(result);
                 },
@@ -791,4 +791,5 @@ impl MusicLibrary {
 
         Ok(albums)
     }
+
 }