diff --git a/CodeIgniter-3.1.13/application/models/Model_music.php b/CodeIgniter-3.1.13/application/models/Model_music.php
index 25d4ca6..a8fbb1a 100644
--- a/CodeIgniter-3.1.13/application/models/Model_music.php
+++ b/CodeIgniter-3.1.13/application/models/Model_music.php
@@ -83,7 +83,7 @@ class Model_music extends CI_Model {
 		if (!empty($album)) {
             $this->db->where_in('album.name', $album);
         }
-		if ($sort && in_array($sort, ['year', 'artistName', 'name', 'genreName'])) {
+		if ($sort && in_array($sort, ['year', 'artistName', 'name', 'albumName', 'genreName'])) {
             $this->db->order_by($sort, $order);
         }
         $query = $this->db->get();
diff --git a/CodeIgniter-3.1.13/application/views/chansons_list.php b/CodeIgniter-3.1.13/application/views/chansons_list.php
index 3230c3a..9ac745c 100644
--- a/CodeIgniter-3.1.13/application/views/chansons_list.php
+++ b/CodeIgniter-3.1.13/application/views/chansons_list.php
@@ -67,7 +67,7 @@
         }
 
 		function sortAlbums(column, order) {
-            var url = "<?= site_url('albums/index'); ?>";
+            var url = "<?= site_url('chansons/index'); ?>";
             url += "?sort=" + column + "&order=" + order;
             window.location.href = url;
         }
@@ -132,8 +132,10 @@
 	<button onclick="sortAlbums('year', 'desc')">Sort by Year Desc</button>
 	<button onclick="sortAlbums('artistName', 'asc')">Sort by Artist Asc</button>
 	<button onclick="sortAlbums('artistName', 'desc')">Sort by Artist Desc</button>
-	<button onclick="sortAlbums('name', 'asc')">Sort by Album Name Asc</button>
-	<button onclick="sortAlbums('name', 'desc')">Sort by Album Name Desc</button>
+    <button onclick="sortAlbums('name', 'asc')">Sort by Chanson Name Asc</button>
+	<button onclick="sortAlbums('name', 'desc')">Sort by Chanson Name Desc</button>
+	<button onclick="sortAlbums('albumName', 'asc')">Sort by Album Name Asc</button>
+	<button onclick="sortAlbums('albumName', 'desc')">Sort by Album Name Desc</button>
 	<button onclick="sortAlbums('genreName', 'asc')">Sort by Genre Asc</button>
 	<button onclick="sortAlbums('genreName', 'desc')">Sort by Genre Desc</button>
 </div>