diff --git a/src/db.c b/src/db.c
index 79248cac..7e17549a 100644
--- a/src/db.c
+++ b/src/db.c
@@ -1356,7 +1356,7 @@ db_query_start(struct query_params *qp)
 	break;
 
       case Q_BROWSE_COMPOSERS:
-	ret = db_build_query_browse(qp, "composer", "composer", &query);
+	ret = db_build_query_browse(qp, "composer", "composer_sort", &query);
 	break;
 
       default:
diff --git a/src/filescanner.c b/src/filescanner.c
index d3316f28..070670b9 100644
--- a/src/filescanner.c
+++ b/src/filescanner.c
@@ -358,11 +358,11 @@ fixup_tags(struct media_file_info *mfi)
   if (!mfi->album_artist_sort && (strcmp(mfi->album_artist, mfi->artist) == 0))
     mfi->album_artist_sort = strdup(mfi->artist_sort);
   else
-    normalize_fixup_tag(&mfi->album_artist_sort, mfi->album_artist);
+    normalize_fixup_tag(&mfi->album_artist_sort, strip_article(mfi->album_artist));
 
   /* Composer is not one of our mandatory tags, so take extra care */
   if (mfi->composer_sort || mfi->composer)
-    normalize_fixup_tag(&mfi->composer_sort, mfi->composer);
+    normalize_fixup_tag(&mfi->composer_sort, strip_article(mfi->composer));
 }