diff --git a/server/handler/test_data/db b/server/handler/test_data/db
index 35b48f4..df6cd27 100644
Binary files a/server/handler/test_data/db and b/server/handler/test_data/db differ
diff --git a/server/handler/test_data/test_get_album_list_alpha_artist b/server/handler/test_data/test_get_album_list_alpha_artist
index fc7f932..86716b4 100644
--- a/server/handler/test_data/test_get_album_list_alpha_artist
+++ b/server/handler/test_data/test_get_album_list_alpha_artist
@@ -35,16 +35,25 @@
           "id": 8,
           "coverArt": 8,
           "artist": "A Certain Ratio",
-          "title": "(1981) To Each.",
+          "title": "(1981) To EachOTHER.",
           "parent": 6,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
+        {
+          "id": 23,
+          "coverArt": 23,
+          "artist": "Captain Beefheart",
+          "title": "(1970) Lick My Decals Off, Bitch",
+          "parent": 22,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
         {
           "id": 5,
           "coverArt": 5,
           "artist": "Dead Moon",
-          "title": "(1989) Unknown Passage",
+          "title": "(1989) Unknown PassagePENIS",
           "parent": 4,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
@@ -84,15 +93,6 @@
           "parent": 20,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
-        },
-        {
-          "id": 15,
-          "coverArt": 15,
-          "artist": "There",
-          "title": "(2010) Anika",
-          "parent": 14,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
         }
       ]
     }
diff --git a/server/handler/test_data/test_get_album_list_alpha_name b/server/handler/test_data/test_get_album_list_alpha_name
index 2ad9f87..ff0d6c5 100644
--- a/server/handler/test_data/test_get_album_list_alpha_name
+++ b/server/handler/test_data/test_get_album_list_alpha_name
@@ -31,6 +31,15 @@
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
+        {
+          "id": 23,
+          "coverArt": 23,
+          "artist": "Captain Beefheart",
+          "title": "(1970) Lick My Decals Off, Bitch",
+          "parent": 22,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
         {
           "id": 19,
           "coverArt": 19,
@@ -53,7 +62,7 @@
           "id": 8,
           "coverArt": 8,
           "artist": "A Certain Ratio",
-          "title": "(1981) To Each.",
+          "title": "(1981) To EachOTHER.",
           "parent": 6,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
@@ -71,7 +80,7 @@
           "id": 5,
           "coverArt": 5,
           "artist": "Dead Moon",
-          "title": "(1989) Unknown Passage",
+          "title": "(1989) Unknown PassagePENIS",
           "parent": 4,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
@@ -84,15 +93,6 @@
           "parent": 6,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
-        },
-        {
-          "id": 15,
-          "coverArt": 15,
-          "artist": "There",
-          "title": "(2010) Anika",
-          "parent": 14,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
         }
       ]
     }
diff --git a/server/handler/test_data/test_get_album_list_newest b/server/handler/test_data/test_get_album_list_newest
index b647239..749bc24 100644
--- a/server/handler/test_data/test_get_album_list_newest
+++ b/server/handler/test_data/test_get_album_list_newest
@@ -4,6 +4,15 @@
     "version": "1.9.0",
     "albumList": {
       "album": [
+        {
+          "id": 23,
+          "coverArt": 23,
+          "artist": "Captain Beefheart",
+          "title": "(1970) Lick My Decals Off, Bitch",
+          "parent": 22,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
         {
           "id": 21,
           "coverArt": 21,
@@ -62,7 +71,7 @@
           "id": 8,
           "coverArt": 8,
           "artist": "A Certain Ratio",
-          "title": "(1981) To Each.",
+          "title": "(1981) To EachOTHER.",
           "parent": 6,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
@@ -80,19 +89,10 @@
           "id": 5,
           "coverArt": 5,
           "artist": "Dead Moon",
-          "title": "(1989) Unknown Passage",
+          "title": "(1989) Unknown PassagePENIS",
           "parent": 4,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
-        },
-        {
-          "id": 3,
-          "coverArt": 3,
-          "artist": "Jah Wobble, The Edge, Holger Czukay",
-          "title": "(1983) Snake Charmer",
-          "parent": 2,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
         }
       ]
     }
diff --git a/server/handler/test_data/test_get_album_list_random b/server/handler/test_data/test_get_album_list_random
index 12968b3..34ac408 100644
--- a/server/handler/test_data/test_get_album_list_random
+++ b/server/handler/test_data/test_get_album_list_random
@@ -5,56 +5,20 @@
     "albumList": {
       "album": [
         {
-          "id": 11,
-          "coverArt": 11,
-          "artist": "13th Floor Lowervators",
-          "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators",
-          "parent": 9,
+          "id": 23,
+          "coverArt": 23,
+          "artist": "Captain Beefheart",
+          "title": "(1970) Lick My Decals Off, Bitch",
+          "parent": 22,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 15,
-          "coverArt": 15,
-          "artist": "There",
-          "title": "(2010) Anika",
-          "parent": 14,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
-        },
-        {
-          "id": 3,
-          "coverArt": 3,
-          "artist": "Jah Wobble, The Edge, Holger Czukay",
-          "title": "(1983) Snake Charmer",
-          "parent": 2,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
-        },
-        {
-          "id": 5,
-          "coverArt": 5,
-          "artist": "Dead Moon",
-          "title": "(1989) Unknown Passage",
-          "parent": 4,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
-        },
-        {
-          "id": 8,
-          "coverArt": 8,
-          "artist": "A Certain Ratio",
-          "title": "(1981) To Each.",
-          "parent": 6,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
-        },
-        {
-          "id": 19,
-          "coverArt": 19,
-          "artist": "Swell Maps",
-          "title": "(1979) A Trip to Marineville",
-          "parent": 17,
+          "id": 21,
+          "coverArt": 21,
+          "artist": "Ten Years After",
+          "title": "(1967) Ten Years After",
+          "parent": 20,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
@@ -76,6 +40,15 @@
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
+        {
+          "id": 11,
+          "coverArt": 11,
+          "artist": "13th Floor Lowervators",
+          "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators",
+          "parent": 9,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
         {
           "id": 7,
           "coverArt": 7,
@@ -86,11 +59,38 @@
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 21,
-          "coverArt": 21,
-          "artist": "Ten Years After",
-          "title": "(1967) Ten Years After",
-          "parent": 20,
+          "id": 5,
+          "coverArt": 5,
+          "artist": "Dead Moon",
+          "title": "(1989) Unknown PassagePENIS",
+          "parent": 4,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 8,
+          "coverArt": 8,
+          "artist": "A Certain Ratio",
+          "title": "(1981) To EachOTHER.",
+          "parent": 6,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 15,
+          "coverArt": 15,
+          "artist": "There",
+          "title": "(2010) Anika",
+          "parent": 14,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 19,
+          "coverArt": 19,
+          "artist": "Swell Maps",
+          "title": "(1979) A Trip to Marineville",
+          "parent": 17,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         }
diff --git a/server/handler/test_data/test_get_album_list_two_alpha_artist b/server/handler/test_data/test_get_album_list_two_alpha_artist
index d020b9f..713cf9d 100644
--- a/server/handler/test_data/test_get_album_list_two_alpha_artist
+++ b/server/handler/test_data/test_get_album_list_two_alpha_artist
@@ -10,7 +10,7 @@
           "artistId": 4,
           "artist": "13th Floor Elevators",
           "name": "Easter Everywhere",
-          "created": "2019-06-10T17:06:26.01139089+01:00"
+          "created": "2019-06-27T15:24:02.46573003+01:00"
         },
         {
           "id": 11,
@@ -18,7 +18,7 @@
           "artistId": 4,
           "artist": "13th Floor Elevators",
           "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-06-10T17:06:26.015039416+01:00"
+          "created": "2019-06-27T15:24:02.470330345+01:00"
         },
         {
           "id": 7,
@@ -26,14 +26,14 @@
           "artistId": 3,
           "artist": "A Certain Ratio",
           "name": "The Graveyard and the Ballroom",
-          "created": "2019-06-10T17:06:26.003805335+01:00"
+          "created": "2019-06-27T15:24:02.450659914+01:00"
         },
         {
           "id": 8,
           "artistId": 3,
           "artist": "A Certain Ratio",
           "name": "To Each...",
-          "created": "2019-06-10T17:06:26.00810814+01:00"
+          "created": "2019-06-27T15:24:02.461369276+01:00"
         },
         {
           "id": 15,
@@ -41,7 +41,15 @@
           "artistId": 5,
           "artist": "Anikas",
           "name": "Anika",
-          "created": "2019-06-10T17:06:26.028934348+01:00"
+          "created": "2019-06-27T15:24:02.477628419+01:00"
+        },
+        {
+          "id": 23,
+          "coverArt": 23,
+          "artistId": 8,
+          "artist": "Captain Beefheart & His Magic Band",
+          "name": "Lick My Decals Off, Baby",
+          "created": "2019-06-27T15:24:02.506104998+01:00"
         },
         {
           "id": 5,
@@ -49,7 +57,7 @@
           "artistId": 2,
           "artist": "Dead Moon",
           "name": "Unknown Passage",
-          "created": "2019-06-10T17:06:26.000595013+01:00"
+          "created": "2019-06-27T15:24:02.445256544+01:00"
         },
         {
           "id": 3,
@@ -57,7 +65,7 @@
           "artistId": 1,
           "artist": "Jah Wobble, The Edge & Holger Czukay",
           "name": "Snake Charmer",
-          "created": "2019-06-10T17:06:25.998358476+01:00"
+          "created": "2019-06-27T15:24:02.442068575+01:00"
         },
         {
           "id": 18,
@@ -65,7 +73,7 @@
           "artistId": 6,
           "artist": "Swell Maps",
           "name": "Jane From Occupied Europe",
-          "created": "2019-06-10T17:06:26.031594709+01:00"
+          "created": "2019-06-27T15:24:02.485555598+01:00"
         },
         {
           "id": 19,
@@ -73,15 +81,7 @@
           "artistId": 6,
           "artist": "Swell Maps",
           "name": "A Trip to Marineville",
-          "created": "2019-06-10T17:06:26.036222364+01:00"
-        },
-        {
-          "id": 21,
-          "coverArt": 21,
-          "artistId": 7,
-          "artist": "Ten Years After",
-          "name": "Ten Years After",
-          "created": "2019-06-10T17:06:26.041345532+01:00"
+          "created": "2019-06-27T15:24:02.492420212+01:00"
         }
       ]
     }
diff --git a/server/handler/test_data/test_get_album_list_two_alpha_name b/server/handler/test_data/test_get_album_list_two_alpha_name
index d619573..6ba4985 100644
--- a/server/handler/test_data/test_get_album_list_two_alpha_name
+++ b/server/handler/test_data/test_get_album_list_two_alpha_name
@@ -10,7 +10,7 @@
           "artistId": 6,
           "artist": "Swell Maps",
           "name": "A Trip to Marineville",
-          "created": "2019-06-10T17:06:26.036222364+01:00"
+          "created": "2019-06-27T15:24:02.492420212+01:00"
         },
         {
           "id": 15,
@@ -18,7 +18,7 @@
           "artistId": 5,
           "artist": "Anikas",
           "name": "Anika",
-          "created": "2019-06-10T17:06:26.028934348+01:00"
+          "created": "2019-06-27T15:24:02.477628419+01:00"
         },
         {
           "id": 10,
@@ -26,7 +26,7 @@
           "artistId": 4,
           "artist": "13th Floor Elevators",
           "name": "Easter Everywhere",
-          "created": "2019-06-10T17:06:26.01139089+01:00"
+          "created": "2019-06-27T15:24:02.46573003+01:00"
         },
         {
           "id": 18,
@@ -34,7 +34,15 @@
           "artistId": 6,
           "artist": "Swell Maps",
           "name": "Jane From Occupied Europe",
-          "created": "2019-06-10T17:06:26.031594709+01:00"
+          "created": "2019-06-27T15:24:02.485555598+01:00"
+        },
+        {
+          "id": 23,
+          "coverArt": 23,
+          "artistId": 8,
+          "artist": "Captain Beefheart & His Magic Band",
+          "name": "Lick My Decals Off, Baby",
+          "created": "2019-06-27T15:24:02.506104998+01:00"
         },
         {
           "id": 3,
@@ -42,7 +50,7 @@
           "artistId": 1,
           "artist": "Jah Wobble, The Edge & Holger Czukay",
           "name": "Snake Charmer",
-          "created": "2019-06-10T17:06:25.998358476+01:00"
+          "created": "2019-06-27T15:24:02.442068575+01:00"
         },
         {
           "id": 21,
@@ -50,7 +58,7 @@
           "artistId": 7,
           "artist": "Ten Years After",
           "name": "Ten Years After",
-          "created": "2019-06-10T17:06:26.041345532+01:00"
+          "created": "2019-06-27T15:24:02.49914444+01:00"
         },
         {
           "id": 7,
@@ -58,7 +66,7 @@
           "artistId": 3,
           "artist": "A Certain Ratio",
           "name": "The Graveyard and the Ballroom",
-          "created": "2019-06-10T17:06:26.003805335+01:00"
+          "created": "2019-06-27T15:24:02.450659914+01:00"
         },
         {
           "id": 11,
@@ -66,22 +74,14 @@
           "artistId": 4,
           "artist": "13th Floor Elevators",
           "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-06-10T17:06:26.015039416+01:00"
+          "created": "2019-06-27T15:24:02.470330345+01:00"
         },
         {
           "id": 8,
           "artistId": 3,
           "artist": "A Certain Ratio",
           "name": "To Each...",
-          "created": "2019-06-10T17:06:26.00810814+01:00"
-        },
-        {
-          "id": 5,
-          "coverArt": 5,
-          "artistId": 2,
-          "artist": "Dead Moon",
-          "name": "Unknown Passage",
-          "created": "2019-06-10T17:06:26.000595013+01:00"
+          "created": "2019-06-27T15:24:02.461369276+01:00"
         }
       ]
     }
diff --git a/server/handler/test_data/test_get_album_list_two_newest b/server/handler/test_data/test_get_album_list_two_newest
index 2f61c71..8c4e990 100644
--- a/server/handler/test_data/test_get_album_list_two_newest
+++ b/server/handler/test_data/test_get_album_list_two_newest
@@ -4,13 +4,21 @@
     "version": "1.9.0",
     "albumList2": {
       "album": [
+        {
+          "id": 23,
+          "coverArt": 23,
+          "artistId": 8,
+          "artist": "Captain Beefheart & His Magic Band",
+          "name": "Lick My Decals Off, Baby",
+          "created": "2019-06-27T15:24:02.506104998+01:00"
+        },
         {
           "id": 21,
           "coverArt": 21,
           "artistId": 7,
           "artist": "Ten Years After",
           "name": "Ten Years After",
-          "created": "2019-06-10T17:06:26.041345532+01:00"
+          "created": "2019-06-27T15:24:02.49914444+01:00"
         },
         {
           "id": 19,
@@ -18,7 +26,7 @@
           "artistId": 6,
           "artist": "Swell Maps",
           "name": "A Trip to Marineville",
-          "created": "2019-06-10T17:06:26.036222364+01:00"
+          "created": "2019-06-27T15:24:02.492420212+01:00"
         },
         {
           "id": 18,
@@ -26,7 +34,7 @@
           "artistId": 6,
           "artist": "Swell Maps",
           "name": "Jane From Occupied Europe",
-          "created": "2019-06-10T17:06:26.031594709+01:00"
+          "created": "2019-06-27T15:24:02.485555598+01:00"
         },
         {
           "id": 15,
@@ -34,7 +42,7 @@
           "artistId": 5,
           "artist": "Anikas",
           "name": "Anika",
-          "created": "2019-06-10T17:06:26.028934348+01:00"
+          "created": "2019-06-27T15:24:02.477628419+01:00"
         },
         {
           "id": 11,
@@ -42,7 +50,7 @@
           "artistId": 4,
           "artist": "13th Floor Elevators",
           "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-06-10T17:06:26.015039416+01:00"
+          "created": "2019-06-27T15:24:02.470330345+01:00"
         },
         {
           "id": 10,
@@ -50,14 +58,14 @@
           "artistId": 4,
           "artist": "13th Floor Elevators",
           "name": "Easter Everywhere",
-          "created": "2019-06-10T17:06:26.01139089+01:00"
+          "created": "2019-06-27T15:24:02.46573003+01:00"
         },
         {
           "id": 8,
           "artistId": 3,
           "artist": "A Certain Ratio",
           "name": "To Each...",
-          "created": "2019-06-10T17:06:26.00810814+01:00"
+          "created": "2019-06-27T15:24:02.461369276+01:00"
         },
         {
           "id": 7,
@@ -65,7 +73,7 @@
           "artistId": 3,
           "artist": "A Certain Ratio",
           "name": "The Graveyard and the Ballroom",
-          "created": "2019-06-10T17:06:26.003805335+01:00"
+          "created": "2019-06-27T15:24:02.450659914+01:00"
         },
         {
           "id": 5,
@@ -73,15 +81,7 @@
           "artistId": 2,
           "artist": "Dead Moon",
           "name": "Unknown Passage",
-          "created": "2019-06-10T17:06:26.000595013+01:00"
-        },
-        {
-          "id": 3,
-          "coverArt": 3,
-          "artistId": 1,
-          "artist": "Jah Wobble, The Edge & Holger Czukay",
-          "name": "Snake Charmer",
-          "created": "2019-06-10T17:06:25.998358476+01:00"
+          "created": "2019-06-27T15:24:02.445256544+01:00"
         }
       ]
     }
diff --git a/server/handler/test_data/test_get_album_list_two_random b/server/handler/test_data/test_get_album_list_two_random
index 1ce9ff8..4764a1d 100644
--- a/server/handler/test_data/test_get_album_list_two_random
+++ b/server/handler/test_data/test_get_album_list_two_random
@@ -10,63 +10,7 @@
           "artistId": 2,
           "artist": "Dead Moon",
           "name": "Unknown Passage",
-          "created": "2019-06-10T17:06:26.000595013+01:00"
-        },
-        {
-          "id": 10,
-          "coverArt": 10,
-          "artistId": 4,
-          "artist": "13th Floor Elevators",
-          "name": "Easter Everywhere",
-          "created": "2019-06-10T17:06:26.01139089+01:00"
-        },
-        {
-          "id": 11,
-          "coverArt": 11,
-          "artistId": 4,
-          "artist": "13th Floor Elevators",
-          "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-06-10T17:06:26.015039416+01:00"
-        },
-        {
-          "id": 3,
-          "coverArt": 3,
-          "artistId": 1,
-          "artist": "Jah Wobble, The Edge & Holger Czukay",
-          "name": "Snake Charmer",
-          "created": "2019-06-10T17:06:25.998358476+01:00"
-        },
-        {
-          "id": 19,
-          "coverArt": 19,
-          "artistId": 6,
-          "artist": "Swell Maps",
-          "name": "A Trip to Marineville",
-          "created": "2019-06-10T17:06:26.036222364+01:00"
-        },
-        {
-          "id": 7,
-          "coverArt": 7,
-          "artistId": 3,
-          "artist": "A Certain Ratio",
-          "name": "The Graveyard and the Ballroom",
-          "created": "2019-06-10T17:06:26.003805335+01:00"
-        },
-        {
-          "id": 15,
-          "coverArt": 15,
-          "artistId": 5,
-          "artist": "Anikas",
-          "name": "Anika",
-          "created": "2019-06-10T17:06:26.028934348+01:00"
-        },
-        {
-          "id": 18,
-          "coverArt": 18,
-          "artistId": 6,
-          "artist": "Swell Maps",
-          "name": "Jane From Occupied Europe",
-          "created": "2019-06-10T17:06:26.031594709+01:00"
+          "created": "2019-06-27T15:24:02.445256544+01:00"
         },
         {
           "id": 21,
@@ -74,14 +18,70 @@
           "artistId": 7,
           "artist": "Ten Years After",
           "name": "Ten Years After",
-          "created": "2019-06-10T17:06:26.041345532+01:00"
+          "created": "2019-06-27T15:24:02.49914444+01:00"
+        },
+        {
+          "id": 10,
+          "coverArt": 10,
+          "artistId": 4,
+          "artist": "13th Floor Elevators",
+          "name": "Easter Everywhere",
+          "created": "2019-06-27T15:24:02.46573003+01:00"
         },
         {
           "id": 8,
           "artistId": 3,
           "artist": "A Certain Ratio",
           "name": "To Each...",
-          "created": "2019-06-10T17:06:26.00810814+01:00"
+          "created": "2019-06-27T15:24:02.461369276+01:00"
+        },
+        {
+          "id": 11,
+          "coverArt": 11,
+          "artistId": 4,
+          "artist": "13th Floor Elevators",
+          "name": "The Psychedelic Sounds of the 13th Floor Elevators",
+          "created": "2019-06-27T15:24:02.470330345+01:00"
+        },
+        {
+          "id": 15,
+          "coverArt": 15,
+          "artistId": 5,
+          "artist": "Anikas",
+          "name": "Anika",
+          "created": "2019-06-27T15:24:02.477628419+01:00"
+        },
+        {
+          "id": 7,
+          "coverArt": 7,
+          "artistId": 3,
+          "artist": "A Certain Ratio",
+          "name": "The Graveyard and the Ballroom",
+          "created": "2019-06-27T15:24:02.450659914+01:00"
+        },
+        {
+          "id": 3,
+          "coverArt": 3,
+          "artistId": 1,
+          "artist": "Jah Wobble, The Edge & Holger Czukay",
+          "name": "Snake Charmer",
+          "created": "2019-06-27T15:24:02.442068575+01:00"
+        },
+        {
+          "id": 23,
+          "coverArt": 23,
+          "artistId": 8,
+          "artist": "Captain Beefheart & His Magic Band",
+          "name": "Lick My Decals Off, Baby",
+          "created": "2019-06-27T15:24:02.506104998+01:00"
+        },
+        {
+          "id": 18,
+          "coverArt": 18,
+          "artistId": 6,
+          "artist": "Swell Maps",
+          "name": "Jane From Occupied Europe",
+          "created": "2019-06-27T15:24:02.485555598+01:00"
         }
       ]
     }
diff --git a/server/handler/test_data/test_get_album_with_cover b/server/handler/test_data/test_get_album_with_cover
index 8b13875..0c941e3 100644
--- a/server/handler/test_data/test_get_album_with_cover
+++ b/server/handler/test_data/test_get_album_with_cover
@@ -8,17 +8,18 @@
       "artistId": 1,
       "artist": "Jah Wobble, The Edge & Holger Czukay",
       "name": "Snake Charmer",
-      "created": "2019-06-10T17:06:25.998358476+01:00",
+      "created": "2019-06-27T15:24:02.442068575+01:00",
       "song": [
         {
           "album": "Snake Charmer",
           "albumId": 3,
           "artist": "Jah Wobble, The Edge & Holger Czukay",
           "artistId": 1,
-          "bitRate": 866,
+          "bitRate": 882,
           "contentType": "audio/x-flac",
           "coverArt": 3,
-          "created": "2019-06-10T17:06:25.998787704+01:00",
+          "created": "2019-06-27T15:24:02.442790707+01:00",
+          "duration": 372,
           "id": 1,
           "parent": 3,
           "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/01.05 Snake Charmer.flac",
@@ -34,36 +35,18 @@
           "albumId": 3,
           "artist": "Jah Wobble, The Edge & Holger Czukay",
           "artistId": 1,
-          "bitRate": 733,
+          "bitRate": 814,
           "contentType": "audio/x-flac",
           "coverArt": 3,
-          "created": "2019-06-10T17:06:25.999138309+01:00",
-          "id": 2,
-          "parent": 3,
-          "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/03.05 It Was a Camel.flac",
-          "size": 31080508,
-          "suffix": "flac",
-          "title": "It Was a Camel",
-          "track": 1,
-          "discNumber": 1,
-          "type": "music"
-        },
-        {
-          "album": "Snake Charmer",
-          "albumId": 3,
-          "artist": "Jah Wobble, The Edge & Holger Czukay",
-          "artistId": 1,
-          "bitRate": 798,
-          "contentType": "audio/x-flac",
-          "coverArt": 3,
-          "created": "2019-06-10T17:06:25.999449918+01:00",
+          "created": "2019-06-27T15:24:02.443827287+01:00",
+          "duration": 523,
           "id": 3,
           "parent": 3,
           "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/02.05 Hold On to Your Dreams.flac",
           "size": 53447545,
           "suffix": "flac",
           "title": "Hold On to Your Dreams",
-          "track": 1,
+          "track": 2,
           "discNumber": 1,
           "type": "music"
         },
@@ -72,17 +55,18 @@
           "albumId": 3,
           "artist": "Jah Wobble, The Edge & Holger Czukay",
           "artistId": 1,
-          "bitRate": 867,
+          "bitRate": 745,
           "contentType": "audio/x-flac",
           "coverArt": 3,
-          "created": "2019-06-10T17:06:25.999768289+01:00",
-          "id": 4,
+          "created": "2019-06-27T15:24:02.443344614+01:00",
+          "duration": 331,
+          "id": 2,
           "parent": 3,
-          "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/05.05 Snake Charmer (reprise).flac",
-          "size": 46427922,
+          "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/03.05 It Was a Camel.flac",
+          "size": 31080508,
           "suffix": "flac",
-          "title": "Snake Charmer (reprise)",
-          "track": 1,
+          "title": "It Was a Camel",
+          "track": 3,
           "discNumber": 1,
           "type": "music"
         },
@@ -91,17 +75,38 @@
           "albumId": 3,
           "artist": "Jah Wobble, The Edge & Holger Czukay",
           "artistId": 1,
-          "bitRate": 961,
+          "bitRate": 976,
           "contentType": "audio/x-flac",
           "coverArt": 3,
-          "created": "2019-06-10T17:06:26.000111656+01:00",
+          "created": "2019-06-27T15:24:02.444768977+01:00",
+          "duration": 227,
           "id": 5,
           "parent": 3,
           "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/04.05 Sleazy.flac",
           "size": 27938750,
           "suffix": "flac",
           "title": "Sleazy",
-          "track": 1,
+          "track": 4,
+          "discNumber": 1,
+          "type": "music"
+        },
+        {
+          "album": "Snake Charmer",
+          "albumId": 3,
+          "artist": "Jah Wobble, The Edge & Holger Czukay",
+          "artistId": 1,
+          "bitRate": 884,
+          "contentType": "audio/x-flac",
+          "coverArt": 3,
+          "created": "2019-06-27T15:24:02.444311153+01:00",
+          "duration": 418,
+          "id": 4,
+          "parent": 3,
+          "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/05.05 Snake Charmer (reprise).flac",
+          "size": 46427922,
+          "suffix": "flac",
+          "title": "Snake Charmer (reprise)",
+          "track": 5,
           "discNumber": 1,
           "type": "music"
         }
diff --git a/server/handler/test_data/test_get_album_without_cover b/server/handler/test_data/test_get_album_without_cover
index 84ba29f..a0e0653 100644
--- a/server/handler/test_data/test_get_album_without_cover
+++ b/server/handler/test_data/test_get_album_without_cover
@@ -4,7 +4,7 @@
     "version": "1.9.0",
     "album": {
       "id": 2,
-      "created": "2019-06-10T17:06:25.998150103+01:00"
+      "created": "2019-06-27T15:24:02.441859723+01:00"
     }
   }
 }
diff --git a/server/handler/test_data/test_get_artist_id_one b/server/handler/test_data/test_get_artist_id_one
index de52da6..e232143 100644
--- a/server/handler/test_data/test_get_artist_id_one
+++ b/server/handler/test_data/test_get_artist_id_one
@@ -12,7 +12,7 @@
           "artistId": 1,
           "artist": "Jah Wobble, The Edge & Holger Czukay",
           "name": "Snake Charmer",
-          "created": "2019-06-10T17:06:25.998358476+01:00"
+          "created": "2019-06-27T15:24:02.442068575+01:00"
         }
       ]
     }
diff --git a/server/handler/test_data/test_get_artist_id_three b/server/handler/test_data/test_get_artist_id_three
index cccae96..2daab69 100644
--- a/server/handler/test_data/test_get_artist_id_three
+++ b/server/handler/test_data/test_get_artist_id_three
@@ -12,14 +12,14 @@
           "artistId": 3,
           "artist": "A Certain Ratio",
           "name": "The Graveyard and the Ballroom",
-          "created": "2019-06-10T17:06:26.003805335+01:00"
+          "created": "2019-06-27T15:24:02.450659914+01:00"
         },
         {
           "id": 8,
           "artistId": 3,
           "artist": "A Certain Ratio",
           "name": "To Each...",
-          "created": "2019-06-10T17:06:26.00810814+01:00"
+          "created": "2019-06-27T15:24:02.461369276+01:00"
         }
       ]
     }
diff --git a/server/handler/test_data/test_get_artist_id_two b/server/handler/test_data/test_get_artist_id_two
index 874e11d..cd9b5bf 100644
--- a/server/handler/test_data/test_get_artist_id_two
+++ b/server/handler/test_data/test_get_artist_id_two
@@ -12,7 +12,7 @@
           "artistId": 2,
           "artist": "Dead Moon",
           "name": "Unknown Passage",
-          "created": "2019-06-10T17:06:26.000595013+01:00"
+          "created": "2019-06-27T15:24:02.445256544+01:00"
         }
       ]
     }
diff --git a/server/handler/test_data/test_get_artists_no_args b/server/handler/test_data/test_get_artists_no_args
index 46e8e78..359e0ae 100644
--- a/server/handler/test_data/test_get_artists_no_args
+++ b/server/handler/test_data/test_get_artists_no_args
@@ -29,6 +29,16 @@
             }
           ]
         },
+        {
+          "name": "c",
+          "artist": [
+            {
+              "id": 8,
+              "name": "Captain Beefheart & His Magic Band",
+              "albumCount": 1
+            }
+          ]
+        },
         {
           "name": "d",
           "artist": [
diff --git a/server/handler/test_data/test_get_indexes_no_args b/server/handler/test_data/test_get_indexes_no_args
index b56be40..c9adfd1 100644
--- a/server/handler/test_data/test_get_indexes_no_args
+++ b/server/handler/test_data/test_get_indexes_no_args
@@ -30,6 +30,16 @@
             }
           ]
         },
+        {
+          "name": "c",
+          "artist": [
+            {
+              "id": 22,
+              "name": "Captain Beefheart",
+              "albumCount": 1
+            }
+          ]
+        },
         {
           "name": "d",
           "artist": [
diff --git a/server/handler/test_data/test_get_music_directory_with_tracks b/server/handler/test_data/test_get_music_directory_with_tracks
index 509b527..1cae3bb 100644
--- a/server/handler/test_data/test_get_music_directory_with_tracks
+++ b/server/handler/test_data/test_get_music_directory_with_tracks
@@ -10,10 +10,11 @@
         {
           "album": "(1983) Snake Charmer",
           "artist": "Jah Wobble, The Edge & Holger Czukay",
-          "bitRate": 866,
+          "bitRate": 882,
           "contentType": "audio/x-flac",
           "coverArt": 3,
           "created": "0001-01-01T00:00:00Z",
+          "duration": 372,
           "id": 1,
           "parent": 3,
           "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/01.05 Snake Charmer.flac",
@@ -27,68 +28,72 @@
         {
           "album": "(1983) Snake Charmer",
           "artist": "Jah Wobble, The Edge & Holger Czukay",
-          "bitRate": 798,
+          "bitRate": 814,
           "contentType": "audio/x-flac",
           "coverArt": 3,
           "created": "0001-01-01T00:00:00Z",
+          "duration": 523,
           "id": 3,
           "parent": 3,
           "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/02.05 Hold On to Your Dreams.flac",
           "size": 53447545,
           "suffix": "flac",
           "title": "Hold On to Your Dreams",
-          "track": 1,
+          "track": 2,
           "discNumber": 1,
           "type": "music"
         },
         {
           "album": "(1983) Snake Charmer",
           "artist": "Jah Wobble, The Edge & Holger Czukay",
-          "bitRate": 733,
+          "bitRate": 745,
           "contentType": "audio/x-flac",
           "coverArt": 3,
           "created": "0001-01-01T00:00:00Z",
+          "duration": 331,
           "id": 2,
           "parent": 3,
           "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/03.05 It Was a Camel.flac",
           "size": 31080508,
           "suffix": "flac",
           "title": "It Was a Camel",
-          "track": 1,
+          "track": 3,
           "discNumber": 1,
           "type": "music"
         },
         {
           "album": "(1983) Snake Charmer",
           "artist": "Jah Wobble, The Edge & Holger Czukay",
-          "bitRate": 961,
+          "bitRate": 976,
           "contentType": "audio/x-flac",
           "coverArt": 3,
           "created": "0001-01-01T00:00:00Z",
+          "duration": 227,
           "id": 5,
           "parent": 3,
           "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/04.05 Sleazy.flac",
           "size": 27938750,
           "suffix": "flac",
           "title": "Sleazy",
-          "track": 1,
+          "track": 4,
           "discNumber": 1,
           "type": "music"
         },
         {
           "album": "(1983) Snake Charmer",
           "artist": "Jah Wobble, The Edge & Holger Czukay",
-          "bitRate": 867,
+          "bitRate": 884,
           "contentType": "audio/x-flac",
           "coverArt": 3,
           "created": "0001-01-01T00:00:00Z",
+          "duration": 418,
           "id": 4,
           "parent": 3,
           "path": "Jah Wobble, The Edge, Holger Czukay/(1983) Snake Charmer/05.05 Snake Charmer (reprise).flac",
           "size": 46427922,
           "suffix": "flac",
           "title": "Snake Charmer (reprise)",
-          "track": 1,
+          "track": 5,
           "discNumber": 1,
           "type": "music"
         }
diff --git a/server/handler/test_data/test_search_three_q_13 b/server/handler/test_data/test_search_three_q_13
index dff8055..5d36a6d 100644
--- a/server/handler/test_data/test_search_three_q_13
+++ b/server/handler/test_data/test_search_three_q_13
@@ -16,7 +16,7 @@
           "artistId": 4,
           "artist": "13th Floor Elevators",
           "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-06-10T17:06:26.015039416+01:00"
+          "created": "2019-06-27T15:24:02.470330345+01:00"
         }
       ]
     }
diff --git a/server/handler/test_data/test_search_three_q_ani b/server/handler/test_data/test_search_three_q_ani
index 016359a..124d8e2 100644
--- a/server/handler/test_data/test_search_three_q_ani
+++ b/server/handler/test_data/test_search_three_q_ani
@@ -16,7 +16,7 @@
           "artistId": 5,
           "artist": "Anikas",
           "name": "Anika",
-          "created": "2019-06-10T17:06:26.028934348+01:00"
+          "created": "2019-06-27T15:24:02.477628419+01:00"
         }
       ]
     }
diff --git a/server/handler/test_data/test_search_two_q_13 b/server/handler/test_data/test_search_two_q_13
index 4de69e6..4d4bda6 100644
--- a/server/handler/test_data/test_search_two_q_13
+++ b/server/handler/test_data/test_search_two_q_13
@@ -24,28 +24,30 @@
         {
           "album": "(1994) The Graveyard and the Ballroom",
           "artist": "A Certain Ratio",
-          "bitRate": 877,
+          "bitRate": 894,
           "contentType": "audio/x-flac",
           "coverArt": 7,
           "created": "0001-01-01T00:00:00Z",
-          "id": 15,
+          "duration": 332,
+          "id": 16,
           "parent": 7,
           "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/13.14 Flight.flac",
           "size": 37302417,
           "suffix": "flac",
           "title": "Flight",
-          "track": 1,
+          "track": 13,
           "discNumber": 1,
           "type": "music"
         },
         {
           "album": "(1966) The Psychedelic Sounds of the 13th Floor Elevators",
           "artist": "13th Floor Elevators",
-          "bitRate": 245,
+          "bitRate": 244,
           "contentType": "audio/mpeg",
           "coverArt": 11,
           "created": "0001-01-01T00:00:00Z",
-          "id": 49,
+          "duration": 154,
+          "id": 50,
           "parent": 11,
           "path": "13th Floor Lowervators/(1966) The Psychedelic Sounds of the 13th Floor Elevators/13.21 Before You Accuse Me.mp3",
           "size": 4722688,
@@ -58,17 +60,18 @@
         {
           "album": "(1980) Jane From Occupied Europe",
           "artist": "Swell Maps",
-          "bitRate": 1176,
+          "bitRate": 1204,
           "contentType": "audio/x-flac",
           "coverArt": 18,
           "created": "0001-01-01T00:00:00Z",
-          "id": 85,
+          "duration": 220,
+          "id": 86,
           "parent": 18,
           "path": "Swell Maps/(1980) Jane From Occupied Europe/13.16 Blenheim Shots.flac",
           "size": 33140852,
           "suffix": "flac",
           "title": "Blenheim Shots",
-          "track": 1,
+          "track": 13,
           "discNumber": 1,
           "type": "music"
         },
@@ -79,7 +82,8 @@
           "contentType": "audio/mpeg",
           "coverArt": 19,
           "created": "0001-01-01T00:00:00Z",
-          "id": 102,
+          "duration": 463,
+          "id": 103,
           "parent": 19,
           "path": "Swell Maps/(1979) A Trip to Marineville/d01 13.14 Adventuring Into Basketry.mp3",
           "size": 17119309,
@@ -96,7 +100,8 @@
           "contentType": "audio/ogg",
           "coverArt": 21,
           "created": "0001-01-01T00:00:00Z",
-          "id": 115,
+          "duration": 433,
+          "id": 117,
           "parent": 21,
           "path": "Ten Years After/(1967) Ten Years After/13.15 Spider in My Web.ogg",
           "size": 10400948,
@@ -105,6 +110,24 @@
           "track": 13,
           "discNumber": 1,
           "type": "music"
+        },
+        {
+          "album": "(1970) Lick My Decals Off, Bitch",
+          "artist": "Captain Beefheart & His Magic Band",
+          "bitRate": 160,
+          "contentType": "audio/mpeg",
+          "coverArt": 23,
+          "created": "0001-01-01T00:00:00Z",
+          "duration": 152,
+          "id": 139,
+          "parent": 23,
+          "path": "Captain Beefheart/(1970) Lick My Decals Off, Bitch/13.15 Space-Age Couple.mp3",
+          "size": 3054515,
+          "suffix": "mp3",
+          "title": "Space-Age Couple",
+          "track": 13,
+          "discNumber": 1,
+          "type": "music"
         }
       ]
     }