diff --git a/src/middleware/Albums.js b/src/middleware/Albums.js
index 2076b32..312675c 100644
--- a/src/middleware/Albums.js
+++ b/src/middleware/Albums.js
@@ -242,7 +242,9 @@ class Albums extends Pages {
 
         const item = {
             ...album.toJSON(),
-            released: formatDate(album.released, "MM/dd/yyyy"),
+            released: album.released
+                ? formatDate(album.released, "MM/dd/yyyy")
+                : null,
         };
 
         this.setPageContent("item", item);
diff --git a/views/pages/collection.ejs b/views/pages/collection.ejs
index a0530f7..8ba62cd 100644
--- a/views/pages/collection.ejs
+++ b/views/pages/collection.ejs
@@ -175,10 +175,10 @@
 
                 let url = `/api/v1/albums?userId=${this.userId}&page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`;
                 if ( this.artist ) {
-                    url += `&artists_sort=${this.artist}`;
+                    url += `&artists_sort=${this.artist.replace('&', '%26')}`;
                 }
                 if ( this.format ) {
-                    url += `&format=${this.format}`;
+                    url += `&format=${this.format.replace('&', '%26')}`;
                 }
                 if ( this.year ) {
                     url += `&year=${this.year}`;
diff --git a/views/pages/mon-compte/ma-collection/index.ejs b/views/pages/mon-compte/ma-collection/index.ejs
index eb21c37..f8c5f2e 100644
--- a/views/pages/mon-compte/ma-collection/index.ejs
+++ b/views/pages/mon-compte/ma-collection/index.ejs
@@ -229,10 +229,10 @@
 
                 let url = `/api/v1/albums?page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`;
                 if ( this.artist ) {
-                    url += `&artists_sort=${this.artist}`;
+                    url += `&artists_sort=${this.artist.replace('&', '%26')}`;
                 }
                 if ( this.format ) {
-                    url += `&format=${this.format}`;
+                    url += `&format=${this.format.replace('&', '%26')}`;
                 }
                 if ( this.year ) {
                     url += `&year=${this.year}`;