diff --git a/builder.go b/builder.go
index 4104b3a..8812c4e 100644
--- a/builder.go
+++ b/builder.go
@@ -49,7 +49,7 @@ func TwoRowItemRenderer(t string, a gjson.Result) []Item {
 
 	var id string
 
-	if t == "album" || t == "singles" {
+	if t == "album" {
 		id = "menu.menuRenderer.items.#(menuNavigationItemRenderer" +
 			".text.runs.0.text == Shuffle play).menuNavigationItemRenderer" +
 			".navigationEndpoint.watchPlaylistEndpoint.playlistId"
@@ -117,7 +117,7 @@ func ResponsiveListItemRenderer(s gjson.Result) []Item {
 					Title: flex.Get("#(navigationEndpoint.watchEndpoint" +
 						".videoId).text").String(),
 					SubId: flex.Get("#.navigationEndpoint.browseEndpoint" +
-						".#(browseId).browseId").String(),
+						".browseId").Get("0").String(),
 					Sub: flex.Get("#(navigationEndpoint.browseEndpoint" +
 						".browseId).text").String(),
 					Thumbnails: GetThumbnails(j.Get("thumbnail.musicThumbnailRenderer" +
diff --git a/main.go b/main.go
index 16d28da..50e50da 100644
--- a/main.go
+++ b/main.go
@@ -17,7 +17,7 @@ func SetHeaders(c *fiber.Ctx) error {
 }
 
 func HandleHealth(c *fiber.Ctx) error {
-	defer calc(c.OriginalURL())()
+	defer calc()()
 
 	fmt.Println("Health Check!!")
 
@@ -25,7 +25,7 @@ func HandleHealth(c *fiber.Ctx) error {
 }
 
 func HandleExplore(c *fiber.Ctx) error {
-	defer calc(c.OriginalURL())()
+	defer calc()()
 
 	res, status := FetchExplore()
 
@@ -33,7 +33,7 @@ func HandleExplore(c *fiber.Ctx) error {
 }
 
 func HandleNext(c *fiber.Ctx) error {
-	defer calc(c.OriginalURL())()
+	defer calc()()
 
 	res, status := FetchNext(c.Params("id"))
 
@@ -41,7 +41,7 @@ func HandleNext(c *fiber.Ctx) error {
 }
 
 func HandleGenres(c *fiber.Ctx) error {
-	defer calc(c.OriginalURL())()
+	defer calc()()
 
 	res, status := FetchGenres()
 
@@ -49,7 +49,7 @@ func HandleGenres(c *fiber.Ctx) error {
 }
 
 func HandleGenre(c *fiber.Ctx) error {
-	defer calc(c.OriginalURL())()
+	defer calc()()
 
 	res, status := FetchGenre(c.Params("id"))
 
@@ -57,7 +57,7 @@ func HandleGenre(c *fiber.Ctx) error {
 }
 
 func HandleBrowse(c *fiber.Ctx) error {
-	defer calc(c.OriginalURL())()
+	defer calc()()
 
 	id := c.Params("id")
 
@@ -81,7 +81,7 @@ func HandleBrowse(c *fiber.Ctx) error {
 }
 
 func HandleArtist(c *fiber.Ctx) error {
-	defer calc(c.OriginalURL())()
+	defer calc()()
 
 	res, status := FetchArtist(c.Params("id"))
 
diff --git a/parser.go b/parser.go
index 30890e8..5f10fbe 100644
--- a/parser.go
+++ b/parser.go
@@ -145,8 +145,8 @@ func ParseArtist(raw string) (string, error) {
 		Items: Items{
 			Songs:   ResponsiveListItemRenderer(s.Get("contents")),
 			Albums:  TwoRowItemRenderer("album", a.Get("contents")),
-			Singles: TwoRowItemRenderer("singles", m.Get("contents")),
-			Artists: TwoRowItemRenderer("artist", u.Get("contents")),
+			Singles: TwoRowItemRenderer("album", m.Get("contents")),
+			Artists: TwoRowItemRenderer("", u.Get("contents")),
 		},
 	}
 
diff --git a/utils.go b/utils.go
index 7764f50..04ae8fa 100644
--- a/utils.go
+++ b/utils.go
@@ -44,10 +44,10 @@ func ErrorMessage(err error) string {
 	return fmt.Sprintf("{\"error\":\"%s\",\"message\":\"Got Error: %s\"}", data)
 }
 
-func calc(url string) func() {
+func calc() func() {
 	start := time.Now()
 	return func() {
-		msg := fmt.Sprintf("Responded %v in %v\n", url, time.Since(start))
+		msg := fmt.Sprintf("Responded in %v\n", time.Since(start))
 		fmt.Println(msg)
 	}
 }