diff --git a/gnomemusic/query.py b/gnomemusic/query.py
index c4ff40c09c7aa3f26911e5467f4255c9c6eb4ab0..3ad1bf6a8696fa2cdc28b2383ba9eecb6e578755 100644
--- a/gnomemusic/query.py
+++ b/gnomemusic/query.py
@@ -936,26 +936,21 @@ class Query():
     @staticmethod
     def get_songs_with_artist_match(name):
         name = Tracker.sparql_escape_string(name)
-        query = """?performer fts:match '"nmm:artistName" : %(name)s*' . """.replace('\n', ' ').strip() % {'name': name}
+        query = """?song nmm:performer [ fts:match '%(name)s*' ] . """.replace('\n',' ').strip() % {'name': name}
 
         return Query.songs(query)
 
     @staticmethod
     def get_songs_with_album_match(name):
         name = Tracker.sparql_escape_string(name)
-        query = """?album fts:match '"nie:title" : %(name)s*' . """.replace('\n', ' ').strip() % {'name': name}
+        query = """?song nmm:musicAlbum [ fts:match '%(name)s*' ] . """.replace('\n', ' ').strip() % {'name': name}
 
         return Query.songs(query)
 
     @staticmethod
     def get_songs_with_composer_match(name):
         name = Tracker.sparql_escape_string(name)
-        query = """
-            ?song nmm:composer ?composer .
-            ?composer fts:match '"nmm:artistName" : %(name)s*' .
-        """.replace('\n', ' ').strip() % {
-            'name': name
-        }
+        query = """?song nmm:composer [ fts:match '%(name)s*' ] . """.replace('\n', ' ').strip() % {'name': name}
 
         return Query.songs(query)