diff --git a/src/library/genre/GenreLibrary.vue b/src/library/genre/GenreLibrary.vue
index 1ba381e..8e39326 100644
--- a/src/library/genre/GenreLibrary.vue
+++ b/src/library/genre/GenreLibrary.vue
@@ -6,7 +6,7 @@
           :title="item.name">
       <template #text>
         <strong>{{ item.albumCount }}</strong> albums •
-        <strong>{{ item.songCount }}</strong> songs
+        <strong>{{ item.trackCount }}</strong> tracks
       </template>
     </Tile>
   </Tiles>
diff --git a/src/shared/api.ts b/src/shared/api.ts
index 6be8993..d79a76f 100644
--- a/src/shared/api.ts
+++ b/src/shared/api.ts
@@ -109,9 +109,10 @@ export class API {
       .map((item: any) => ({
         id: item.value,
         name: item.value,
-        ...item,
+        albumCount: item.albumCount,
+        trackCount: item.songCount,
       }))
-      .sort((a: any, b:any) => a.name.localeCompare(b.name))
+      .sort((a: any, b:any) => b.albumCount - a.albumCount)
   }
 
   async getAlbumsByGenre(id: string) {