diff --git a/server/ctrlsubsonic/spec/construct_by_folder.go b/server/ctrlsubsonic/spec/construct_by_folder.go
index fb42786..dc65d4a 100644
--- a/server/ctrlsubsonic/spec/construct_by_folder.go
+++ b/server/ctrlsubsonic/spec/construct_by_folder.go
@@ -12,6 +12,8 @@ func NewAlbumByFolder(f *db.Album) *Album {
 		ID:            f.SID(),
 		IsDir:         true,
 		ParentID:      f.ParentSID(),
+		Album:         f.RightPath,
+		Name:          f.RightPath,
 		Title:         f.RightPath,
 		TrackCount:    f.ChildCount,
 		Duration:      f.Duration,
diff --git a/server/ctrlsubsonic/spec/construct_by_tags.go b/server/ctrlsubsonic/spec/construct_by_tags.go
index ea59b68..5a4027a 100644
--- a/server/ctrlsubsonic/spec/construct_by_tags.go
+++ b/server/ctrlsubsonic/spec/construct_by_tags.go
@@ -11,7 +11,9 @@ func NewAlbumByTags(a *db.Album, artists []*db.Artist) *Album {
 	ret := &Album{
 		Created:       a.CreatedAt,
 		ID:            a.SID(),
+		Album:         a.TagTitle,
 		Name:          a.TagTitle,
+		Title:         a.TagTitle,
 		Year:          a.TagYear,
 		TrackCount:    a.ChildCount,
 		Duration:      a.Duration,
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist b/server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist
index 5334b51..93a53dc 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist
@@ -13,10 +13,10 @@
           "artist": "artist-0",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-0",
-          "album": "",
+          "album": "album-0",
           "parent": "al-2",
           "isDir": true,
-          "name": "",
+          "name": "album-0",
           "songCount": 3,
           "duration": 300
         },
@@ -26,10 +26,10 @@
           "artist": "artist-0",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-1",
-          "album": "",
+          "album": "album-1",
           "parent": "al-2",
           "isDir": true,
-          "name": "",
+          "name": "album-1",
           "songCount": 3,
           "duration": 300
         },
@@ -39,10 +39,10 @@
           "artist": "artist-0",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-2",
-          "album": "",
+          "album": "album-2",
           "parent": "al-2",
           "isDir": true,
-          "name": "",
+          "name": "album-2",
           "songCount": 3,
           "duration": 300
         },
@@ -52,10 +52,10 @@
           "artist": "artist-1",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-0",
-          "album": "",
+          "album": "album-0",
           "parent": "al-6",
           "isDir": true,
-          "name": "",
+          "name": "album-0",
           "songCount": 3,
           "duration": 300
         },
@@ -65,10 +65,10 @@
           "artist": "artist-1",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-1",
-          "album": "",
+          "album": "album-1",
           "parent": "al-6",
           "isDir": true,
-          "name": "",
+          "name": "album-1",
           "songCount": 3,
           "duration": 300
         },
@@ -78,10 +78,10 @@
           "artist": "artist-1",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-2",
-          "album": "",
+          "album": "album-2",
           "parent": "al-6",
           "isDir": true,
-          "name": "",
+          "name": "album-2",
           "songCount": 3,
           "duration": 300
         },
@@ -91,10 +91,10 @@
           "artist": "artist-2",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-0",
-          "album": "",
+          "album": "album-0",
           "parent": "al-10",
           "isDir": true,
-          "name": "",
+          "name": "album-0",
           "songCount": 3,
           "duration": 300
         },
@@ -104,10 +104,10 @@
           "artist": "artist-2",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-1",
-          "album": "",
+          "album": "album-1",
           "parent": "al-10",
           "isDir": true,
-          "name": "",
+          "name": "album-1",
           "songCount": 3,
           "duration": 300
         },
@@ -117,10 +117,10 @@
           "artist": "artist-2",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-2",
-          "album": "",
+          "album": "album-2",
           "parent": "al-10",
           "isDir": true,
-          "name": "",
+          "name": "album-2",
           "songCount": 3,
           "duration": 300
         }
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_alpha_name b/server/ctrlsubsonic/testdata/test_get_album_list_alpha_name
index 0a906db..f625f48 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_alpha_name
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_alpha_name
@@ -13,10 +13,10 @@
           "artist": "artist-0",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-0",
-          "album": "",
+          "album": "album-0",
           "parent": "al-2",
           "isDir": true,
-          "name": "",
+          "name": "album-0",
           "songCount": 3,
           "duration": 300
         },
@@ -26,10 +26,10 @@
           "artist": "artist-1",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-0",
-          "album": "",
+          "album": "album-0",
           "parent": "al-6",
           "isDir": true,
-          "name": "",
+          "name": "album-0",
           "songCount": 3,
           "duration": 300
         },
@@ -39,10 +39,10 @@
           "artist": "artist-2",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-0",
-          "album": "",
+          "album": "album-0",
           "parent": "al-10",
           "isDir": true,
-          "name": "",
+          "name": "album-0",
           "songCount": 3,
           "duration": 300
         },
@@ -52,10 +52,10 @@
           "artist": "artist-0",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-1",
-          "album": "",
+          "album": "album-1",
           "parent": "al-2",
           "isDir": true,
-          "name": "",
+          "name": "album-1",
           "songCount": 3,
           "duration": 300
         },
@@ -65,10 +65,10 @@
           "artist": "artist-1",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-1",
-          "album": "",
+          "album": "album-1",
           "parent": "al-6",
           "isDir": true,
-          "name": "",
+          "name": "album-1",
           "songCount": 3,
           "duration": 300
         },
@@ -78,10 +78,10 @@
           "artist": "artist-2",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-1",
-          "album": "",
+          "album": "album-1",
           "parent": "al-10",
           "isDir": true,
-          "name": "",
+          "name": "album-1",
           "songCount": 3,
           "duration": 300
         },
@@ -91,10 +91,10 @@
           "artist": "artist-0",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-2",
-          "album": "",
+          "album": "album-2",
           "parent": "al-2",
           "isDir": true,
-          "name": "",
+          "name": "album-2",
           "songCount": 3,
           "duration": 300
         },
@@ -104,10 +104,10 @@
           "artist": "artist-1",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-2",
-          "album": "",
+          "album": "album-2",
           "parent": "al-6",
           "isDir": true,
-          "name": "",
+          "name": "album-2",
           "songCount": 3,
           "duration": 300
         },
@@ -117,10 +117,10 @@
           "artist": "artist-2",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-2",
-          "album": "",
+          "album": "album-2",
           "parent": "al-10",
           "isDir": true,
-          "name": "",
+          "name": "album-2",
           "songCount": 3,
           "duration": 300
         }
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_newest b/server/ctrlsubsonic/testdata/test_get_album_list_newest
index 5334b51..93a53dc 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_newest
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_newest
@@ -13,10 +13,10 @@
           "artist": "artist-0",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-0",
-          "album": "",
+          "album": "album-0",
           "parent": "al-2",
           "isDir": true,
-          "name": "",
+          "name": "album-0",
           "songCount": 3,
           "duration": 300
         },
@@ -26,10 +26,10 @@
           "artist": "artist-0",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-1",
-          "album": "",
+          "album": "album-1",
           "parent": "al-2",
           "isDir": true,
-          "name": "",
+          "name": "album-1",
           "songCount": 3,
           "duration": 300
         },
@@ -39,10 +39,10 @@
           "artist": "artist-0",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-2",
-          "album": "",
+          "album": "album-2",
           "parent": "al-2",
           "isDir": true,
-          "name": "",
+          "name": "album-2",
           "songCount": 3,
           "duration": 300
         },
@@ -52,10 +52,10 @@
           "artist": "artist-1",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-0",
-          "album": "",
+          "album": "album-0",
           "parent": "al-6",
           "isDir": true,
-          "name": "",
+          "name": "album-0",
           "songCount": 3,
           "duration": 300
         },
@@ -65,10 +65,10 @@
           "artist": "artist-1",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-1",
-          "album": "",
+          "album": "album-1",
           "parent": "al-6",
           "isDir": true,
-          "name": "",
+          "name": "album-1",
           "songCount": 3,
           "duration": 300
         },
@@ -78,10 +78,10 @@
           "artist": "artist-1",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-2",
-          "album": "",
+          "album": "album-2",
           "parent": "al-6",
           "isDir": true,
-          "name": "",
+          "name": "album-2",
           "songCount": 3,
           "duration": 300
         },
@@ -91,10 +91,10 @@
           "artist": "artist-2",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-0",
-          "album": "",
+          "album": "album-0",
           "parent": "al-10",
           "isDir": true,
-          "name": "",
+          "name": "album-0",
           "songCount": 3,
           "duration": 300
         },
@@ -104,10 +104,10 @@
           "artist": "artist-2",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-1",
-          "album": "",
+          "album": "album-1",
           "parent": "al-10",
           "isDir": true,
-          "name": "",
+          "name": "album-1",
           "songCount": 3,
           "duration": 300
         },
@@ -117,10 +117,10 @@
           "artist": "artist-2",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-2",
-          "album": "",
+          "album": "album-2",
           "parent": "al-10",
           "isDir": true,
-          "name": "",
+          "name": "album-2",
           "songCount": 3,
           "duration": 300
         }
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_random b/server/ctrlsubsonic/testdata/test_get_album_list_random
index a77dd86..d99f409 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_random
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_random
@@ -7,55 +7,16 @@
     "openSubsonic": true,
     "albumList": {
       "album": [
-        {
-          "id": "al-12",
-          "coverArt": "al-12",
-          "artist": "artist-2",
-          "created": "2019-11-30T00:00:00Z",
-          "title": "album-1",
-          "album": "",
-          "parent": "al-10",
-          "isDir": true,
-          "name": "",
-          "songCount": 3,
-          "duration": 300
-        },
-        {
-          "id": "al-9",
-          "coverArt": "al-9",
-          "artist": "artist-1",
-          "created": "2019-11-30T00:00:00Z",
-          "title": "album-2",
-          "album": "",
-          "parent": "al-6",
-          "isDir": true,
-          "name": "",
-          "songCount": 3,
-          "duration": 300
-        },
         {
           "id": "al-13",
           "coverArt": "al-13",
           "artist": "artist-2",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-2",
-          "album": "",
+          "album": "album-2",
           "parent": "al-10",
           "isDir": true,
-          "name": "",
-          "songCount": 3,
-          "duration": 300
-        },
-        {
-          "id": "al-3",
-          "coverArt": "al-3",
-          "artist": "artist-0",
-          "created": "2019-11-30T00:00:00Z",
-          "title": "album-0",
-          "album": "",
-          "parent": "al-2",
-          "isDir": true,
-          "name": "",
+          "name": "album-2",
           "songCount": 3,
           "duration": 300
         },
@@ -65,49 +26,49 @@
           "artist": "artist-1",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-1",
-          "album": "",
+          "album": "album-1",
           "parent": "al-6",
           "isDir": true,
-          "name": "",
+          "name": "album-1",
           "songCount": 3,
           "duration": 300
         },
         {
-          "id": "al-5",
-          "coverArt": "al-5",
-          "artist": "artist-0",
-          "created": "2019-11-30T00:00:00Z",
-          "title": "album-2",
-          "album": "",
-          "parent": "al-2",
-          "isDir": true,
-          "name": "",
-          "songCount": 3,
-          "duration": 300
-        },
-        {
-          "id": "al-4",
-          "coverArt": "al-4",
-          "artist": "artist-0",
-          "created": "2019-11-30T00:00:00Z",
-          "title": "album-1",
-          "album": "",
-          "parent": "al-2",
-          "isDir": true,
-          "name": "",
-          "songCount": 3,
-          "duration": 300
-        },
-        {
-          "id": "al-7",
-          "coverArt": "al-7",
+          "id": "al-9",
+          "coverArt": "al-9",
           "artist": "artist-1",
           "created": "2019-11-30T00:00:00Z",
-          "title": "album-0",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "parent": "al-6",
           "isDir": true,
-          "name": "",
+          "name": "album-2",
+          "songCount": 3,
+          "duration": 300
+        },
+        {
+          "id": "al-3",
+          "coverArt": "al-3",
+          "artist": "artist-0",
+          "created": "2019-11-30T00:00:00Z",
+          "title": "album-0",
+          "album": "album-0",
+          "parent": "al-2",
+          "isDir": true,
+          "name": "album-0",
+          "songCount": 3,
+          "duration": 300
+        },
+        {
+          "id": "al-12",
+          "coverArt": "al-12",
+          "artist": "artist-2",
+          "created": "2019-11-30T00:00:00Z",
+          "title": "album-1",
+          "album": "album-1",
+          "parent": "al-10",
+          "isDir": true,
+          "name": "album-1",
           "songCount": 3,
           "duration": 300
         },
@@ -117,10 +78,49 @@
           "artist": "artist-2",
           "created": "2019-11-30T00:00:00Z",
           "title": "album-0",
-          "album": "",
+          "album": "album-0",
           "parent": "al-10",
           "isDir": true,
-          "name": "",
+          "name": "album-0",
+          "songCount": 3,
+          "duration": 300
+        },
+        {
+          "id": "al-4",
+          "coverArt": "al-4",
+          "artist": "artist-0",
+          "created": "2019-11-30T00:00:00Z",
+          "title": "album-1",
+          "album": "album-1",
+          "parent": "al-2",
+          "isDir": true,
+          "name": "album-1",
+          "songCount": 3,
+          "duration": 300
+        },
+        {
+          "id": "al-5",
+          "coverArt": "al-5",
+          "artist": "artist-0",
+          "created": "2019-11-30T00:00:00Z",
+          "title": "album-2",
+          "album": "album-2",
+          "parent": "al-2",
+          "isDir": true,
+          "name": "album-2",
+          "songCount": 3,
+          "duration": 300
+        },
+        {
+          "id": "al-7",
+          "coverArt": "al-7",
+          "artist": "artist-1",
+          "created": "2019-11-30T00:00:00Z",
+          "title": "album-0",
+          "album": "album-0",
+          "parent": "al-6",
+          "isDir": true,
+          "name": "album-0",
           "songCount": 3,
           "duration": 300
         }
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_artist b/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_artist
index 31b04ea..d7712d0 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_artist
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_artist
@@ -14,8 +14,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 3,
           "duration": 300,
@@ -28,8 +28,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
@@ -42,8 +42,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
@@ -56,8 +56,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 3,
           "duration": 300,
@@ -70,8 +70,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
@@ -84,8 +84,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
@@ -98,8 +98,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 3,
           "duration": 300,
@@ -112,8 +112,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
@@ -126,8 +126,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_name b/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_name
index 7c86974..c1df51b 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_name
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_name
@@ -14,8 +14,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 3,
           "duration": 300,
@@ -28,8 +28,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 3,
           "duration": 300,
@@ -42,8 +42,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 3,
           "duration": 300,
@@ -56,8 +56,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
@@ -70,8 +70,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
@@ -84,8 +84,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
@@ -98,8 +98,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
@@ -112,8 +112,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
@@ -126,8 +126,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_two_newest b/server/ctrlsubsonic/testdata/test_get_album_list_two_newest
index 31b04ea..d7712d0 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_two_newest
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_two_newest
@@ -14,8 +14,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 3,
           "duration": 300,
@@ -28,8 +28,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
@@ -42,8 +42,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
@@ -56,8 +56,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 3,
           "duration": 300,
@@ -70,8 +70,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
@@ -84,8 +84,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
@@ -98,8 +98,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 3,
           "duration": 300,
@@ -112,8 +112,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
@@ -126,8 +126,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_two_random b/server/ctrlsubsonic/testdata/test_get_album_list_two_random
index 1c3efea..d503321 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_two_random
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_two_random
@@ -8,57 +8,15 @@
     "albumList2": {
       "album": [
         {
-          "id": "al-3",
-          "coverArt": "al-3",
-          "artistId": "ar-1",
-          "artist": "artist-0",
-          "artists": [{ "id": "ar-1", "name": "artist-0" }],
-          "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
-          "name": "album-0",
-          "songCount": 3,
-          "duration": 300,
-          "year": 2021
-        },
-        {
-          "id": "al-7",
-          "coverArt": "al-7",
-          "artistId": "ar-2",
-          "artist": "artist-1",
-          "artists": [{ "id": "ar-2", "name": "artist-1" }],
-          "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
-          "name": "album-0",
-          "songCount": 3,
-          "duration": 300,
-          "year": 2021
-        },
-        {
-          "id": "al-12",
-          "coverArt": "al-12",
+          "id": "al-11",
+          "coverArt": "al-11",
           "artistId": "ar-3",
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
-          "name": "album-1",
-          "songCount": 3,
-          "duration": 300,
-          "year": 2021
-        },
-        {
-          "id": "al-13",
-          "coverArt": "al-13",
-          "artistId": "ar-3",
-          "artist": "artist-2",
-          "artists": [{ "id": "ar-3", "name": "artist-2" }],
-          "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
-          "name": "album-2",
+          "title": "album-0",
+          "album": "album-0",
+          "name": "album-0",
           "songCount": 3,
           "duration": 300,
           "year": 2021
@@ -70,13 +28,41 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
           "year": 2021
         },
+        {
+          "id": "al-12",
+          "coverArt": "al-12",
+          "artistId": "ar-3",
+          "artist": "artist-2",
+          "artists": [{ "id": "ar-3", "name": "artist-2" }],
+          "created": "2019-11-30T00:00:00Z",
+          "title": "album-1",
+          "album": "album-1",
+          "name": "album-1",
+          "songCount": 3,
+          "duration": 300,
+          "year": 2021
+        },
+        {
+          "id": "al-7",
+          "coverArt": "al-7",
+          "artistId": "ar-2",
+          "artist": "artist-1",
+          "artists": [{ "id": "ar-2", "name": "artist-1" }],
+          "created": "2019-11-30T00:00:00Z",
+          "title": "album-0",
+          "album": "album-0",
+          "name": "album-0",
+          "songCount": 3,
+          "duration": 300,
+          "year": 2021
+        },
         {
           "id": "al-4",
           "coverArt": "al-4",
@@ -84,23 +70,37 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
           "year": 2021
         },
         {
-          "id": "al-11",
-          "coverArt": "al-11",
+          "id": "al-3",
+          "coverArt": "al-3",
+          "artistId": "ar-1",
+          "artist": "artist-0",
+          "artists": [{ "id": "ar-1", "name": "artist-0" }],
+          "created": "2019-11-30T00:00:00Z",
+          "title": "album-0",
+          "album": "album-0",
+          "name": "album-0",
+          "songCount": 3,
+          "duration": 300,
+          "year": 2021
+        },
+        {
+          "id": "al-13",
+          "coverArt": "al-13",
           "artistId": "ar-3",
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
-          "name": "album-0",
+          "title": "album-2",
+          "album": "album-2",
+          "name": "album-2",
           "songCount": 3,
           "duration": 300,
           "year": 2021
@@ -112,8 +112,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
@@ -126,8 +126,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
diff --git a/server/ctrlsubsonic/testdata/test_get_album_with_cover b/server/ctrlsubsonic/testdata/test_get_album_with_cover
index 1e24d68..2c900b5 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_with_cover
+++ b/server/ctrlsubsonic/testdata/test_get_album_with_cover
@@ -12,8 +12,8 @@
       "artist": "artist-0",
       "artists": [{ "id": "ar-1", "name": "artist-0" }],
       "created": "2019-11-30T00:00:00Z",
-      "title": "",
-      "album": "",
+      "title": "album-0",
+      "album": "album-0",
       "name": "album-0",
       "songCount": 3,
       "duration": 300,
diff --git a/server/ctrlsubsonic/testdata/test_get_artist_id_one b/server/ctrlsubsonic/testdata/test_get_artist_id_one
index 6174bc5..d8ea4d4 100644
--- a/server/ctrlsubsonic/testdata/test_get_artist_id_one
+++ b/server/ctrlsubsonic/testdata/test_get_artist_id_one
@@ -17,8 +17,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 3,
           "duration": 300,
@@ -33,8 +33,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
@@ -49,8 +49,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
diff --git a/server/ctrlsubsonic/testdata/test_get_artist_id_three b/server/ctrlsubsonic/testdata/test_get_artist_id_three
index b78d052..6194a5b 100644
--- a/server/ctrlsubsonic/testdata/test_get_artist_id_three
+++ b/server/ctrlsubsonic/testdata/test_get_artist_id_three
@@ -17,8 +17,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 3,
           "duration": 300,
@@ -33,8 +33,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
@@ -49,8 +49,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
diff --git a/server/ctrlsubsonic/testdata/test_get_artist_id_two b/server/ctrlsubsonic/testdata/test_get_artist_id_two
index d6853fa..9b60fce 100644
--- a/server/ctrlsubsonic/testdata/test_get_artist_id_two
+++ b/server/ctrlsubsonic/testdata/test_get_artist_id_two
@@ -17,8 +17,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 3,
           "duration": 300,
@@ -33,8 +33,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 3,
           "duration": 300,
@@ -49,8 +49,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 3,
           "duration": 300,
diff --git a/server/ctrlsubsonic/testdata/test_search_three_q_alb b/server/ctrlsubsonic/testdata/test_search_three_q_alb
index f687276..4d00fa5 100644
--- a/server/ctrlsubsonic/testdata/test_search_three_q_alb
+++ b/server/ctrlsubsonic/testdata/test_search_three_q_alb
@@ -14,8 +14,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 0,
           "duration": 0,
@@ -30,8 +30,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 0,
           "duration": 0,
@@ -46,8 +46,8 @@
           "artist": "artist-0",
           "artists": [{ "id": "ar-1", "name": "artist-0" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 0,
           "duration": 0,
@@ -62,8 +62,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 0,
           "duration": 0,
@@ -78,8 +78,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 0,
           "duration": 0,
@@ -94,8 +94,8 @@
           "artist": "artist-1",
           "artists": [{ "id": "ar-2", "name": "artist-1" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 0,
           "duration": 0,
@@ -110,8 +110,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-0",
+          "album": "album-0",
           "name": "album-0",
           "songCount": 0,
           "duration": 0,
@@ -126,8 +126,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-1",
+          "album": "album-1",
           "name": "album-1",
           "songCount": 0,
           "duration": 0,
@@ -142,8 +142,8 @@
           "artist": "artist-2",
           "artists": [{ "id": "ar-3", "name": "artist-2" }],
           "created": "2019-11-30T00:00:00Z",
-          "title": "",
-          "album": "",
+          "title": "album-2",
+          "album": "album-2",
           "name": "album-2",
           "songCount": 0,
           "duration": 0,