diff --git a/js/songs.js b/js/songs.js
index c0ca0f2..d2713cb 100644
--- a/js/songs.js
+++ b/js/songs.js
@@ -1,57 +1,57 @@
-class Songs{
+class Songs {
 
-    list_song=[];
-    list_lang=[];
-    list_country=null;
+    list_song = [];
+    list_lang = [];
+    list_country = null;
 
-    emp_list_song=null;
-    lang="all";
-    box_info_menu_cur="none";
+    emp_list_song = null;
+    lang = "all";
+    box_info_menu_cur = "none";
 
-    show(){
-        var container=$("#container");
+    show() {
+        var container = $("#container");
         $(container).html('');
-        this.list_country=$('<div class="col-12 text-center mb-2" id="list_country"></div>');
-        this.emp_list_song=$('<div class="song-list col-12 pl-3 pr-3" id="song-list"><div><i class="fas fa-spinner fa-spin"></i> Loading...</div></div>');
+        this.list_country = $('<div class="col-12 text-center mb-2" id="list_country"></div>');
+        this.emp_list_song = $('<div class="song-list col-12 pl-3 pr-3" id="song-list"><div><i class="fas fa-spinner fa-spin"></i> Loading...</div></div>');
         $(container).append(this.list_country);
         $(container).append(this.emp_list_song);
-        
-        if(this.list_song.length==0){
-            $.getJSON("https://raw.githubusercontent.com/kurotsmile/Database-Store-Json/main/song.json", function(data) {
-    
-                $.each(data.all_item, function(index, song) {
-                    var obj_artist={"name":song.artist,"lang":song.lang};
-                    m.addOrUpdateObjectToList(m.list_artist,obj_artist);
-    
-                    var obj_year={"name":song.year,"lang":song.lang};
-                    m.addOrUpdateObjectToList(m.list_year,obj_year);
-    
-                    var obj_lang={"name":song.lang,"lang":song.lang};
-                    m.addOrUpdateObjectToList(m.song.list_lang,obj_lang);
+
+        if (this.list_song.length == 0) {
+            $.getJSON("https://raw.githubusercontent.com/kurotsmile/Database-Store-Json/main/song.json", function (data) {
+
+                $.each(data.all_item, function (index, song) {
+                    var obj_artist = { "name": song.artist, "lang": song.lang };
+                    m.addOrUpdateObjectToList(m.list_artist, obj_artist);
+
+                    var obj_year = { "name": song.year, "lang": song.lang };
+                    m.addOrUpdateObjectToList(m.list_year, obj_year);
+
+                    var obj_lang = { "name": song.lang, "lang": song.lang };
+                    m.addOrUpdateObjectToList(m.song.list_lang, obj_lang);
                     m.song.list_song.push(song);
                 });
-    
+
                 m.song.showListSongByData(m.song.list_song);
             });
-        }else{
+        } else {
             m.song.showListSongByData(m.song.list_song);
         }
     }
 
-    showListSongByData(data){
+    showListSongByData(data) {
         m.act_menu("m-music");
         $(m.song.emp_list_song).html('');
-            $.each(data, function(index, song) {
-                var obj_artist={"name":song.artist,"lang":song.lang};
-                m.addOrUpdateObjectToList(m.list_artist,obj_artist);
+        $.each(data, function (index, song) {
+            var obj_artist = { "name": song.artist, "lang": song.lang };
+            m.addOrUpdateObjectToList(m.list_artist, obj_artist);
+
+            var obj_year = { "name": song.year, "lang": song.lang };
+            m.addOrUpdateObjectToList(m.list_year, obj_year);
 
-                var obj_year={"name":song.year,"lang":song.lang};
-                m.addOrUpdateObjectToList(m.list_year,obj_year);
+            var obj_lang = { "name": song.lang, "lang": song.lang };
+            m.addOrUpdateObjectToList(m.song.list_lang, obj_lang);
 
-                var obj_lang={"name":song.lang,"lang":song.lang};
-                m.addOrUpdateObjectToList(m.song.list_lang,obj_lang);
-                
-                var songItem = $(`<div role="button" class="song-item" data-src="${song.mp3}" data-title="${song.name}" data-artist="${song.artist}">
+            var songItem = $(`<div role="button" class="song-item" data-src="${song.mp3}" data-title="${song.name}" data-artist="${song.artist}">
                                     <img src="images/avatar_music.png" alt="Avatar" class="song-avatar">
                                     <div class="song-title">${song.name}</div>
                                     <div class="song-artist">${song.artist}</div>
@@ -59,146 +59,146 @@ class Songs{
                                     <div class="btnplay btn-extension"><i class="fas fa-play-circle"></i></div>
                                     <div class="btndownload btn-extension"><i class="fas fa-arrow-alt-circle-down"></i></div>
                                 </div>`);
-                var btn_info=$('<div class="btninfo btn-extension"><i class="fas fa-info-circle"></i></div>');
+            var btn_info = $('<div class="btninfo btn-extension"><i class="fas fa-info-circle"></i></div>');
 
-                $(btn_info).click(()=>{
-                    m.song.showInfoByData(song);
+            $(btn_info).click(() => {
+                m.song.showInfoByData(song);
+                return false;
+            });
+            $(songItem).append(btn_info);
+
+            if (song.lyrics != null && song.lyrics != "") {
+                var btnlyrics = $('<div class="btnlyrics btn-extension"><i class="fas fa-font"></i></div>');
+                $(btnlyrics).click(() => {
+                    m.song.showlyrics(song);
                     return false;
                 });
-                $(songItem).append(btn_info);
+                $(songItem).append(btnlyrics);
+            }
 
-                if(song.lyrics!=null&&song.lyrics!=""){
-                    var btnlyrics=$('<div class="btnlyrics btn-extension"><i class="fas fa-font"></i></div>');
-                    $(btnlyrics).click(()=>{
-                        m.song.showlyrics(song);
-                        return false;
-                    });
-                    $(songItem).append(btnlyrics);
-                }
-
-                if(song.link_ytb!=null){
-                    var btn_video=$('<div class="btnvideo btn-extension"><i class="fab fa-youtube"></i></div>');
-                    $(btn_video).click(()=>{
-                        m.song.showVideo(song);
-                        return false;
-                    });
-                    $(songItem).append(btn_video);
-                }
+            if (song.link_ytb != null) {
+                var btn_video = $('<div class="btnvideo btn-extension"><i class="fab fa-youtube"></i></div>');
+                $(btn_video).click(() => {
+                    m.song.showVideo(song);
+                    return false;
+                });
+                $(songItem).append(btn_video);
+            }
 
-                $(m.song.emp_list_song).append(songItem);
-            });
+            $(m.song.emp_list_song).append(songItem);
+        });
 
-            $('.song-item').click(function() {
-                var songSrc = $(this).data('src');
-                var songTitle = $(this).data('title');
-                var songArtist = $(this).data('artist');
-                cr_player.play(songSrc,songTitle,songArtist);
-            });
+        $('.song-item').click(function () {
+            var songSrc = $(this).data('src');
+            var songTitle = $(this).data('title');
+            var songArtist = $(this).data('artist');
+            cr_player.play(songSrc, songTitle, songArtist);
+        });
 
-            m.song.showListCountry();
+        m.song.showListCountry();
     }
 
-    showVideo(data){
-        m.song.box_info_menu_cur="video";
-        var html='<iframe width="100%" height="315" src="https://www.youtube.com/embed/'+m.song.getYouTubeVideoId(data.link_ytb)+'?autoplay=0" title="YouTube video player" frameborder="0" allow="accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>';
-        html+='<div id="all_btn_dock"></div>';
+    showVideo(data) {
+        m.song.box_info_menu_cur = "video";
+        var html = '<iframe width="100%" height="315" src="https://www.youtube.com/embed/' + m.song.getYouTubeVideoId(data.link_ytb) + '?autoplay=0" title="YouTube video player" frameborder="0" allow="accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>';
+        html += '<div id="all_btn_dock"></div>';
         Swal.fire({
-            title:data.name,
-            html:html,
+            title: data.name,
+            html: html,
             confirmButtonColor: cr.color_btn,
-            didOpen:()=>{
+            didOpen: () => {
                 m.song.menuSubInfoBox(data);
             }
         });
     }
 
-    showlyrics(data){
-        m.song.box_info_menu_cur="lyrics";
-        var lyrics='';
+    showlyrics(data) {
+        m.song.box_info_menu_cur = "lyrics";
+        var lyrics = '';
         var containsHtmlTags = /<\/?[a-z][\s\S]*>/i.test(data.lyrics);
-        if(containsHtmlTags) lyrics=$(data.lyrics).text();
-        else lyrics=data.lyrics;
-        lyrics+='<div id="all_btn_dock"></div>';
+        if (containsHtmlTags) lyrics = $(data.lyrics).text();
+        else lyrics = data.lyrics;
+        lyrics += '<div id="all_btn_dock"></div>';
         Swal.fire({
-            title:data.name,
-            html:lyrics,
+            title: data.name,
+            html: lyrics,
             confirmButtonColor: cr.color_btn,
-            didOpen:()=>{
+            didOpen: () => {
                 m.song.menuSubInfoBox(data);
             }
         });
     }
 
-    showInfoByData(data){
-        m.song.box_info_menu_cur="info";
-        var t_table_info='<table class="table table-striped table-hover table-responsive fs-9 w-100 text-break" style="text-align:left;width:100%">';
-        t_table_info+='<tbody>';
-        $.each(data,function(k,v){
-            if(v!=""&&v!=null){
-                if(k=="mp3") return true;
-                if(k=="lyrics") return true;
-                if(k=="avatar") return true;
-                t_table_info+=m.song.getValByKeyTable(k,v);
+    showInfoByData(data) {
+        m.song.box_info_menu_cur = "info";
+        var t_table_info = '<table class="table table-striped table-hover table-responsive fs-9 w-100 text-break" style="text-align:left;width:100%">';
+        t_table_info += '<tbody>';
+        $.each(data, function (k, v) {
+            if (v != "" && v != null) {
+                if (k == "mp3") return true;
+                if (k == "lyrics") return true;
+                if (k == "avatar") return true;
+                t_table_info += m.song.getValByKeyTable(k, v);
             }
         });
-        t_table_info+='</tbody>';
-        t_table_info+='</table>';
-        t_table_info+='<div id="all_btn_dock"></div>';
+        t_table_info += '</tbody>';
+        t_table_info += '</table>';
+        t_table_info += '<div id="all_btn_dock"></div>';
         Swal.fire({
-            icon:"info",
-            title:data.name,
-            html:t_table_info,
+            icon: "info",
+            title: data.name,
+            html: t_table_info,
             confirmButtonColor: cr.color_btn,
             iconColor: cr.color_btn,
-            didOpen:()=>{
+            didOpen: () => {
                 m.song.menuSubInfoBox(data);
             }
         });
     }
 
-    menuSubInfoBox(data){
-        if(data.lyrics!=null){
-            var btn_lyrics=$('<button class="btn btn-sm btn-c btn-msg '+(m.song.box_info_menu_cur === "lyrics" ? "active" : "lyrics")+' m-1 animate__animated animate__bounceIn"><i class="fas fa-comment"></i></button>');
-            $(btn_lyrics).click(function(){m.song.showlyrics(data);});
-            $("#all_btn_dock").append(btn_lyrics);    
+    menuSubInfoBox(data) {
+        if (data.lyrics != null) {
+            var btn_lyrics = $('<button class="btn btn-sm btn-c btn-msg ' + (m.song.box_info_menu_cur === "lyrics" ? "active" : "lyrics") + ' m-1 animate__animated animate__bounceIn"><i class="fas fa-comment"></i></button>');
+            $(btn_lyrics).click(function () { m.song.showlyrics(data); });
+            $("#all_btn_dock").append(btn_lyrics);
         }
 
-        if(data.link_ytb!=null){
-            var btn_ytb=$('<button class="btn btn-sm btn-c btn-msg '+(m.song.box_info_menu_cur === "video" ? "active" : "lyrics")+' m-1 animate__animated animate__bounceIn"><i class="fab fa-youtube"></i></button>');
-            $(btn_ytb).click(function(){m.song.showVideo(data);});
-            $("#all_btn_dock").append(btn_ytb);    
+        if (data.link_ytb != null) {
+            var btn_ytb = $('<button class="btn btn-sm btn-c btn-msg ' + (m.song.box_info_menu_cur === "video" ? "active" : "lyrics") + ' m-1 animate__animated animate__bounceIn"><i class="fab fa-youtube"></i></button>');
+            $(btn_ytb).click(function () { m.song.showVideo(data); });
+            $("#all_btn_dock").append(btn_ytb);
         }
 
-        var btn_info=$('<button class="btn btn-sm btn-c btn-msg '+(m.song.box_info_menu_cur === "info" ? "active" : "info")+' m-1 animate__animated animate__bounceIn"><i class="fas fa-info-circle"></i></button>');
-        $(btn_info).click(function(){m.song.showInfoByData(data);});
+        var btn_info = $('<button class="btn btn-sm btn-c btn-msg ' + (m.song.box_info_menu_cur === "info" ? "active" : "info") + ' m-1 animate__animated animate__bounceIn"><i class="fas fa-info-circle"></i></button>');
+        $(btn_info).click(function () { m.song.showInfoByData(data); });
         $("#all_btn_dock").append(btn_info);
 
     }
 
-    getValByKeyTable(k,v){
-        var val='';
-        var html='';
-        var btn_extension='';
+    getValByKeyTable(k, v) {
+        var val = '';
+        var html = '';
+        var btn_extension = '';
         switch (k.toLowerCase()) {
             case "link_ytb":
-                val=m.song.getYouTubeVideoId(v);
-                btn_extension='<a target="_blank" href="'+v+'" class="btn btn-sm btn-dark"><i class="fas fa-external-link-square-alt"></i></a>';
+                val = m.song.getYouTubeVideoId(v);
+                btn_extension = '<a target="_blank" href="' + v + '" class="btn btn-sm btn-dark"><i class="fas fa-external-link-square-alt"></i></a>';
                 break;
-            case "email":
-                btn_extension='<a target="_blank" href="mailto://'+v+'" class="btn btn-sm btn-dark"><i class="fas fa-envelope"></i></a>';
-                val=v;
+            case "artist":
+                btn_extension = '<a onclick="m.song.showListSongByMeta(\'artist\',\''+v+'\')" class="btn btn-sm btn-dark"><i class="fas fa-list"></i></a>';
+                val = v;
                 break;
             default:
-                val=v;
+                val = v;
                 break;
         }
 
-        if(val!=''){
-            html='<tr>';
-                html+='<th scope="row"><i class="fas fa-info"></i> '+k+'</th>';
-                html+='<td>'+val+'</td>';
-                html+='<td>'+btn_extension+'</td>';
-            html+='</tr>';
+        if (val != '') {
+            html = '<tr>';
+            html += '<th scope="row"><i class="fas fa-info"></i> ' + k + '</th>';
+            html += '<td>' + val + '</td>';
+            html += '<td>' + btn_extension + '</td>';
+            html += '</tr>';
         }
         return html;
     }
@@ -209,35 +209,61 @@ class Songs{
         return (match && match[1]) ? match[1] : null;
     }
 
-    showListCountry(){
+    showListCountry() {
         $(m.song.list_country).html('');
 
-        var btn_all_l=$(`<button class="btn btn-sm ${(m.song.lang === "all" ? "active" : "all")} m-1 btn-c btn_l"><i class="fas fa-globe"></i></button>`);
+        var btn_all_l = $(`<button class="btn btn-sm ${(m.song.lang === "all" ? "active" : "all")} m-1 btn-c btn_l"><i class="fas fa-globe"></i></button>`);
         $(m.song.list_country).append(btn_all_l);
-        $(btn_all_l).click(()=>{
-            m.song.lang="all";
+        $(btn_all_l).click(() => {
+            m.song.lang = "all";
             m.song.showListSongByData(m.song.list_song);
         });
 
-        $.each(m.song.list_lang,function(index,l){
-            var btn_l=$(`<button class="btn btn-sm ${(m.song.lang === l.name ? "active" : l.name)} m-1 btn-c btn_l">${l.name}</button>`);
-            $(btn_l).click(()=>{
-                m.song.lang=l.name;
-                var l_new=m.song.getListSongByMeta("lang",l.name);
+        $.each(m.song.list_lang, function (index, l) {
+            var btn_l = $(`<button class="btn btn-sm ${(m.song.lang === l.name ? "active" : l.name)} m-1 btn-c btn_l">${l.name}</button>`);
+            $(btn_l).click(() => {
+                m.song.lang = l.name;
+                var l_new = m.song.getListSongByMeta("lang", l.name);
                 m.song.showListSongByData(l_new);
             });
             $(m.song.list_country).append(btn_l);
         });
     }
 
-    getListSongByMeta(filed,val){
-        var list_s=[];
-        $(m.song.list_song).each(function(index,s){
-            if(s[filed]==val) list_s.push(s);
+    getListSongByMeta(filed, val) {
+        var list_s = [];
+        $(m.song.list_song).each(function (index, s) {
+            if (s[filed] == val) list_s.push(s);
         });
         return list_s;
     }
 
+    showListSongByMeta(filed, val) {
+        var html = '<div class="text-center"><table class="table table-striped table-hover table-responsive fs-9 w-100 text-break"><tbody id="box_list_song"></tbody></table></div>';
+        Swal.fire({
+            title: val,
+            html: html,
+            confirmButtonColor: cr.color_btn,
+            didOpen: () => {
+                var list_song = m.song.getListSongByMeta(filed, val);
+                $.each(list_song, function (index, s) {
+                    var html = '';
+                    html = '<tr role="button">';
+                    html += '<th scope="row"><i class="fas fa-music"></i></th>';
+                    html += '<td>' + s.name + '</td>';
+                    html += '<td><i class="fas fa-play" title="Play One"></i></td>';
+                    html += '</tr>';
+                    var item_box = $(html);
+                    $(item_box).click(() => {
+                        cr_player.play(s.mp3, s.name, s.artist);
+                        Swal.close();
+                    });
+                    $("#box_list_song").append(item_box);
+                });
+            }
+        });
+    }
+
 }
-var song=new Songs();
-m.song=song;
+var song = new Songs();
+m.song = song;
diff --git a/js/songs_artist.js b/js/songs_artist.js
index 47c12b2..19eece1 100644
--- a/js/songs_artist.js
+++ b/js/songs_artist.js
@@ -26,29 +26,7 @@ class Songs_Artist{
             </div>`);
 
             $(artistItem).click(function(){
-                var html='<div class="text-center"><table class="table table-striped table-hover table-responsive fs-9 w-100 text-break"><tbody id="box_list_song"></tbody></table></div>';
-                Swal.fire({
-                    title:a.name,
-                    html:html,
-                    confirmButtonColor: cr.color_btn,
-                    didOpen:()=>{
-                        var list_song=m.song.getListSongByMeta('artist',a.name);
-                        $.each(list_song,function(index,s){
-                            var html='';
-                            html='<tr role="button">';
-                                html+='<th scope="row"><i class="fas fa-music"></i></th>';
-                                html+='<td>'+s.name+'</td>';
-                                html+='<td><i class="fas fa-play" title="Play One"></i></td>';
-                            html+='</tr>';
-                            var item_box=$(html);
-                            $(item_box).click(()=>{
-                                cr_player.play(s.mp3,s.name,s.artist);
-                                Swal.close();
-                            });
-                            $("#box_list_song").append(item_box);
-                        });
-                    }
-                });
+                m.song.showListSongByMeta('artist',a.name);
             });
             $(m.song_artist.emp_list_artist).append(artistItem);
         });
diff --git a/js/songs_year.js b/js/songs_year.js
index 1912b19..ddc6c7b 100644
--- a/js/songs_year.js
+++ b/js/songs_year.js
@@ -21,12 +21,15 @@ class Songs_year{
         $(m.song_year.emp_list_year).html('');
 
         $.each(data,function(index,y){
-            var songItem = `<div role="button" class="song-item">
+            var yearItem = $(`<div role="button" class="song-item">
             <img src="images/timer_music.png" alt="Avatar Year" class="song-avatar">
             <div class="song-title">${y.name}</div>
             <div class="song-artist"><i class="fas fa-music"></i> ${y.amount} song (<i class="fas fa-globe-asia"></i> ${y.lang})</div>
-            </div>`;
-            $(m.song_year.emp_list_year).append(songItem);
+            </div>`);
+            $(yearItem).click(()=>{
+                m.song.showListSongByMeta('year',y.name);
+            });
+            $(m.song_year.emp_list_year).append(yearItem);
         });
         this.showListCountry();
     }