Update lyric_query to use lyric class