diff --git a/src/daap_query.gperf b/src/daap_query.gperf
index 77517dc8..92d08918 100644
--- a/src/daap_query.gperf
+++ b/src/daap_query.gperf
@@ -14,7 +14,7 @@ struct dmap_query_field_map;
 "dmap.itemid",                "f.id",               1
 "daap.songalbum",             "f.album",            0
 "daap.songalbumid",           "f.songalbumid",      1
-"daap.songartist",            "f.artist",           0
+"daap.songartist",            "f.album_artist",     0
 "daap.songalbumartist",       "f.album_artist",     0
 "daap.songbitrate",           "f.bitrate",          1
 "daap.songcomment",           "f.comment",          0
diff --git a/src/db.c b/src/db.c
index c7983c66..3b956cd1 100644
--- a/src/db.c
+++ b/src/db.c
@@ -1206,7 +1206,7 @@ db_query_start(struct query_params *qp)
 	break;
 
       case Q_BROWSE_ARTISTS:
-	ret = db_build_query_browse(qp, "artist", &query);
+	ret = db_build_query_browse(qp, "album_artist", &query);
 	break;
 
       case Q_BROWSE_GENRES: