diff --git a/scanner/metadata/metadata.go b/scanner/metadata/metadata.go
index 6ca810132..15036abd7 100644
--- a/scanner/metadata/metadata.go
+++ b/scanner/metadata/metadata.go
@@ -146,7 +146,7 @@ func (t Tags) Lyrics() string {
 		lyrics = append(lyrics, *lyric)
 	}
 
-	for tag, value := range t.tags {
+	for tag, value := range t.Tags {
 		if strings.HasPrefix(tag, "lyrics-") {
 			language := strings.TrimSpace(strings.TrimPrefix(tag, "lyrics-"))
 
diff --git a/server/subsonic/media_retrieval.go b/server/subsonic/media_retrieval.go
index 562fec1f5..18943e841 100644
--- a/server/subsonic/media_retrieval.go
+++ b/server/subsonic/media_retrieval.go
@@ -129,9 +129,12 @@ func (api *Router) GetLyrics(r *http.Request) (*responses.Subsonic, error) {
 }
 
 func (api *Router) GetLyricsBySongId(r *http.Request) (*responses.Subsonic, error) {
-	id := utils.ParamString(r, "id")
-	mediaFile, err := api.ds.MediaFile(r.Context()).Get(id)
+	id, err := req.Params(r).String("id")
+	if err != nil {
+		return nil, err
+	}
 
+	mediaFile, err := api.ds.MediaFile(r.Context()).Get(id)
 	if err != nil {
 		return nil, err
 	}