diff --git a/server/handler/test_data/db b/server/handler/test_data/db
index 0771cbe..92c4e75 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 86716b4..5718fb4 100644
--- a/server/handler/test_data/test_get_album_list_alpha_artist
+++ b/server/handler/test_data/test_get_album_list_alpha_artist
@@ -4,60 +4,51 @@
     "version": "1.9.0",
     "albumList": {
       "album": [
-        {
-          "id": 10,
-          "coverArt": 10,
-          "artist": "13th Floor Lowervators",
-          "title": "(1967) Easter Nowhere",
-          "parent": 9,
-          "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,
-          "artist": "A Certain Ratio",
-          "title": "(1994) The Graveyard and the Ballroom",
-          "parent": 6,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
-        },
         {
           "id": 8,
           "coverArt": 8,
-          "artist": "A Certain Ratio",
-          "title": "(1981) To EachOTHER.",
-          "parent": 6,
+          "artist": "13th Floor Lowervators",
+          "title": "(1967) Easter Nowhere",
+          "parent": 7,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 23,
-          "coverArt": 23,
-          "artist": "Captain Beefheart",
-          "title": "(1970) Lick My Decals Off, Bitch",
-          "parent": 22,
+          "id": 9,
+          "coverArt": 9,
+          "artist": "13th Floor Lowervators",
+          "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators",
+          "parent": 7,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
           "id": 5,
           "coverArt": 5,
-          "artist": "Dead Moon",
-          "title": "(1989) Unknown PassagePENIS",
+          "artist": "A Certain Ratio",
+          "title": "(1994) The Graveyard and the Ballroom",
           "parent": 4,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
+        {
+          "id": 6,
+          "coverArt": 6,
+          "artist": "A Certain Ratio",
+          "title": "(1981) To EachOTHER.",
+          "parent": 4,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 21,
+          "coverArt": 21,
+          "artist": "Captain Beefheart",
+          "title": "(1970) Lick My Decals Off, Bitch",
+          "parent": 20,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
         {
           "id": 3,
           "coverArt": 3,
@@ -68,29 +59,38 @@
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 18,
-          "coverArt": 18,
+          "id": 16,
+          "coverArt": 16,
           "artist": "Swell Maps",
           "title": "(1980) Jane From Occupied Europe",
-          "parent": 17,
+          "parent": 15,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 17,
+          "coverArt": 17,
+          "artist": "Swell Maps",
+          "title": "(1979) A Trip to Marineville",
+          "parent": 15,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
           "id": 19,
           "coverArt": 19,
-          "artist": "Swell Maps",
-          "title": "(1979) A Trip to Marineville",
-          "parent": 17,
+          "artist": "Ten Years After",
+          "title": "(1967) Ten Years After",
+          "parent": 18,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 21,
-          "coverArt": 21,
-          "artist": "Ten Years After",
-          "title": "(1967) Ten Years After",
-          "parent": 20,
+          "id": 13,
+          "coverArt": 13,
+          "artist": "There",
+          "title": "(2010) Anika",
+          "parent": 12,
           "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 ff0d6c5..3ea3dbf 100644
--- a/server/handler/test_data/test_get_album_list_alpha_name
+++ b/server/handler/test_data/test_get_album_list_alpha_name
@@ -5,65 +5,65 @@
     "albumList": {
       "album": [
         {
-          "id": 11,
-          "coverArt": 11,
+          "id": 9,
+          "coverArt": 9,
           "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": 10,
-          "coverArt": 10,
-          "artist": "13th Floor Lowervators",
-          "title": "(1967) Easter Nowhere",
-          "parent": 9,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
-        },
-        {
-          "id": 21,
-          "coverArt": 21,
-          "artist": "Ten Years After",
-          "title": "(1967) Ten Years After",
-          "parent": 20,
-          "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,
-          "artist": "Swell Maps",
-          "title": "(1979) A Trip to Marineville",
-          "parent": 17,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
-        },
-        {
-          "id": 18,
-          "coverArt": 18,
-          "artist": "Swell Maps",
-          "title": "(1980) Jane From Occupied Europe",
-          "parent": 17,
+          "parent": 7,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
           "id": 8,
           "coverArt": 8,
+          "artist": "13th Floor Lowervators",
+          "title": "(1967) Easter Nowhere",
+          "parent": 7,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 19,
+          "coverArt": 19,
+          "artist": "Ten Years After",
+          "title": "(1967) Ten Years After",
+          "parent": 18,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 21,
+          "coverArt": 21,
+          "artist": "Captain Beefheart",
+          "title": "(1970) Lick My Decals Off, Bitch",
+          "parent": 20,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 17,
+          "coverArt": 17,
+          "artist": "Swell Maps",
+          "title": "(1979) A Trip to Marineville",
+          "parent": 15,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 16,
+          "coverArt": 16,
+          "artist": "Swell Maps",
+          "title": "(1980) Jane From Occupied Europe",
+          "parent": 15,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 6,
+          "coverArt": 6,
           "artist": "A Certain Ratio",
           "title": "(1981) To EachOTHER.",
-          "parent": 6,
+          "parent": 4,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
@@ -79,18 +79,18 @@
         {
           "id": 5,
           "coverArt": 5,
-          "artist": "Dead Moon",
-          "title": "(1989) Unknown PassagePENIS",
+          "artist": "A Certain Ratio",
+          "title": "(1994) The Graveyard and the Ballroom",
           "parent": 4,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 7,
-          "coverArt": 7,
-          "artist": "A Certain Ratio",
-          "title": "(1994) The Graveyard and the Ballroom",
-          "parent": 6,
+          "id": 13,
+          "coverArt": 13,
+          "artist": "There",
+          "title": "(2010) Anika",
+          "parent": 12,
           "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 749bc24..a2b7cf1 100644
--- a/server/handler/test_data/test_get_album_list_newest
+++ b/server/handler/test_data/test_get_album_list_newest
@@ -4,20 +4,11 @@
     "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,
-          "artist": "Ten Years After",
-          "title": "(1967) Ten Years After",
+          "artist": "Captain Beefheart",
+          "title": "(1970) Lick My Decals Off, Bitch",
           "parent": 20,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
@@ -25,74 +16,83 @@
         {
           "id": 19,
           "coverArt": 19,
+          "artist": "Ten Years After",
+          "title": "(1967) Ten Years After",
+          "parent": 18,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 17,
+          "coverArt": 17,
           "artist": "Swell Maps",
           "title": "(1979) A Trip to Marineville",
-          "parent": 17,
+          "parent": 15,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 18,
-          "coverArt": 18,
+          "id": 16,
+          "coverArt": 16,
           "artist": "Swell Maps",
           "title": "(1980) Jane From Occupied Europe",
-          "parent": 17,
+          "parent": 15,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 15,
-          "coverArt": 15,
+          "id": 13,
+          "coverArt": 13,
           "artist": "There",
           "title": "(2010) Anika",
-          "parent": 14,
+          "parent": 12,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 11,
-          "coverArt": 11,
+          "id": 9,
+          "coverArt": 9,
           "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": 10,
-          "coverArt": 10,
-          "artist": "13th Floor Lowervators",
-          "title": "(1967) Easter Nowhere",
-          "parent": 9,
+          "parent": 7,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
           "id": 8,
           "coverArt": 8,
-          "artist": "A Certain Ratio",
-          "title": "(1981) To EachOTHER.",
-          "parent": 6,
+          "artist": "13th Floor Lowervators",
+          "title": "(1967) Easter Nowhere",
+          "parent": 7,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 7,
-          "coverArt": 7,
+          "id": 6,
+          "coverArt": 6,
           "artist": "A Certain Ratio",
-          "title": "(1994) The Graveyard and the Ballroom",
-          "parent": 6,
+          "title": "(1981) To EachOTHER.",
+          "parent": 4,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
           "id": 5,
           "coverArt": 5,
-          "artist": "Dead Moon",
-          "title": "(1989) Unknown PassagePENIS",
+          "artist": "A Certain Ratio",
+          "title": "(1994) The Graveyard and the Ballroom",
           "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 a5e0c95..c934171 100644
--- a/server/handler/test_data/test_get_album_list_random
+++ b/server/handler/test_data/test_get_album_list_random
@@ -5,20 +5,47 @@
     "albumList": {
       "album": [
         {
-          "id": 23,
-          "coverArt": 23,
-          "artist": "Captain Beefheart",
-          "title": "(1970) Lick My Decals Off, Bitch",
-          "parent": 22,
+          "id": 9,
+          "coverArt": 9,
+          "artist": "13th Floor Lowervators",
+          "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators",
+          "parent": 7,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 6,
+          "coverArt": 6,
+          "artist": "A Certain Ratio",
+          "title": "(1981) To EachOTHER.",
+          "parent": 4,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 16,
+          "coverArt": 16,
+          "artist": "Swell Maps",
+          "title": "(1980) Jane From Occupied Europe",
+          "parent": 15,
+          "isDir": true,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": 17,
+          "coverArt": 17,
+          "artist": "Swell Maps",
+          "title": "(1979) A Trip to Marineville",
+          "parent": 15,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
           "id": 19,
           "coverArt": 19,
-          "artist": "Swell Maps",
-          "title": "(1979) A Trip to Marineville",
-          "parent": 17,
+          "artist": "Ten Years After",
+          "title": "(1967) Ten Years After",
+          "parent": 18,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
@@ -31,75 +58,39 @@
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
-        {
-          "id": 5,
-          "coverArt": 5,
-          "artist": "Dead Moon",
-          "title": "(1989) Unknown PassagePENIS",
-          "parent": 4,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
-        },
-        {
-          "id": 10,
-          "coverArt": 10,
-          "artist": "13th Floor Lowervators",
-          "title": "(1967) Easter Nowhere",
-          "parent": 9,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
-        },
         {
           "id": 8,
           "coverArt": 8,
-          "artist": "A Certain Ratio",
-          "title": "(1981) To EachOTHER.",
-          "parent": 6,
+          "artist": "13th Floor Lowervators",
+          "title": "(1967) Easter Nowhere",
+          "parent": 7,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
           "id": 21,
           "coverArt": 21,
-          "artist": "Ten Years After",
-          "title": "(1967) Ten Years After",
+          "artist": "Captain Beefheart",
+          "title": "(1970) Lick My Decals Off, Bitch",
           "parent": 20,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 15,
-          "coverArt": 15,
+          "id": 13,
+          "coverArt": 13,
           "artist": "There",
           "title": "(2010) Anika",
-          "parent": 14,
+          "parent": 12,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 18,
-          "coverArt": 18,
-          "artist": "Swell Maps",
-          "title": "(1980) Jane From Occupied Europe",
-          "parent": 17,
-          "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,
+          "id": 5,
+          "coverArt": 5,
           "artist": "A Certain Ratio",
           "title": "(1994) The Graveyard and the Ballroom",
-          "parent": 6,
+          "parent": 4,
           "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 02197db..333ad3a 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
@@ -5,59 +5,51 @@
     "albumList2": {
       "album": [
         {
-          "id": 10,
-          "coverArt": 10,
-          "artistId": 4,
+          "id": 8,
+          "coverArt": 8,
+          "artistId": 3,
           "artist": "13th Floor Elevators",
           "name": "Easter Everywhere",
-          "created": "2019-07-01T11:33:30.58134155+01:00"
+          "created": "2019-07-05T16:33:39.13742584+01:00"
         },
         {
-          "id": 11,
-          "coverArt": 11,
-          "artistId": 4,
+          "id": 9,
+          "coverArt": 9,
+          "artistId": 3,
           "artist": "13th Floor Elevators",
           "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-07-01T11:33:30.600080603+01:00"
-        },
-        {
-          "id": 7,
-          "coverArt": 7,
-          "artistId": 3,
-          "artist": "A Certain Ratio",
-          "name": "The Graveyard and the Ballroom",
-          "created": "2019-07-01T11:33:30.544346174+01:00"
-        },
-        {
-          "id": 8,
-          "artistId": 3,
-          "artist": "A Certain Ratio",
-          "name": "To Each...",
-          "created": "2019-07-01T11:33:30.570884787+01:00"
-        },
-        {
-          "id": 15,
-          "coverArt": 15,
-          "artistId": 5,
-          "artist": "Anikas",
-          "name": "Anika",
-          "created": "2019-07-01T11:33:30.625217653+01:00"
-        },
-        {
-          "id": 23,
-          "coverArt": 23,
-          "artistId": 8,
-          "artist": "Captain Beefheart & His Magic Band",
-          "name": "Lick My Decals Off, Baby",
-          "created": "2019-07-01T11:33:30.696105506+01:00"
+          "created": "2019-07-05T16:33:39.189977898+01:00"
         },
         {
           "id": 5,
           "coverArt": 5,
           "artistId": 2,
-          "artist": "Dead Moon",
-          "name": "Unknown Passage",
-          "created": "2019-07-01T11:33:30.528889187+01:00"
+          "artist": "A Certain Ratio",
+          "name": "The Graveyard and the Ballroom",
+          "created": "2019-07-05T16:33:39.020273091+01:00"
+        },
+        {
+          "id": 6,
+          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "name": "To Each...",
+          "created": "2019-07-05T16:33:39.081646318+01:00"
+        },
+        {
+          "id": 13,
+          "coverArt": 13,
+          "artistId": 4,
+          "artist": "Anikas",
+          "name": "Anika",
+          "created": "2019-07-05T16:33:39.295969241+01:00"
+        },
+        {
+          "id": 21,
+          "coverArt": 21,
+          "artistId": 7,
+          "artist": "Captain Beefheart & His Magic Band",
+          "name": "Lick My Decals Off, Baby",
+          "created": "2019-07-05T16:33:39.589691095+01:00"
         },
         {
           "id": 3,
@@ -65,23 +57,31 @@
           "artistId": 1,
           "artist": "Jah Wobble, The Edge & Holger Czukay",
           "name": "Snake Charmer",
-          "created": "2019-07-01T11:33:30.512724888+01:00"
+          "created": "2019-07-05T16:33:38.970382938+01:00"
         },
         {
-          "id": 18,
-          "coverArt": 18,
-          "artistId": 6,
+          "id": 16,
+          "coverArt": 16,
+          "artistId": 5,
           "artist": "Swell Maps",
           "name": "Jane From Occupied Europe",
-          "created": "2019-07-01T11:33:30.634997537+01:00"
+          "created": "2019-07-05T16:33:39.401584248+01:00"
+        },
+        {
+          "id": 17,
+          "coverArt": 17,
+          "artistId": 5,
+          "artist": "Swell Maps",
+          "name": "A Trip to Marineville",
+          "created": "2019-07-05T16:33:39.456124086+01:00"
         },
         {
           "id": 19,
           "coverArt": 19,
           "artistId": 6,
-          "artist": "Swell Maps",
-          "name": "A Trip to Marineville",
-          "created": "2019-07-01T11:33:30.659201596+01:00"
+          "artist": "Ten Years After",
+          "name": "Ten Years After",
+          "created": "2019-07-05T16:33:39.514180103+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 3b21620..a0dee5d 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
@@ -5,44 +5,44 @@
     "albumList2": {
       "album": [
         {
-          "id": 19,
-          "coverArt": 19,
-          "artistId": 6,
+          "id": 17,
+          "coverArt": 17,
+          "artistId": 5,
           "artist": "Swell Maps",
           "name": "A Trip to Marineville",
-          "created": "2019-07-01T11:33:30.659201596+01:00"
+          "created": "2019-07-05T16:33:39.456124086+01:00"
         },
         {
-          "id": 15,
-          "coverArt": 15,
-          "artistId": 5,
+          "id": 13,
+          "coverArt": 13,
+          "artistId": 4,
           "artist": "Anikas",
           "name": "Anika",
-          "created": "2019-07-01T11:33:30.625217653+01:00"
+          "created": "2019-07-05T16:33:39.295969241+01:00"
         },
         {
-          "id": 10,
-          "coverArt": 10,
-          "artistId": 4,
+          "id": 8,
+          "coverArt": 8,
+          "artistId": 3,
           "artist": "13th Floor Elevators",
           "name": "Easter Everywhere",
-          "created": "2019-07-01T11:33:30.58134155+01:00"
+          "created": "2019-07-05T16:33:39.13742584+01:00"
         },
         {
-          "id": 18,
-          "coverArt": 18,
-          "artistId": 6,
+          "id": 16,
+          "coverArt": 16,
+          "artistId": 5,
           "artist": "Swell Maps",
           "name": "Jane From Occupied Europe",
-          "created": "2019-07-01T11:33:30.634997537+01:00"
+          "created": "2019-07-05T16:33:39.401584248+01:00"
         },
         {
-          "id": 23,
-          "coverArt": 23,
-          "artistId": 8,
+          "id": 21,
+          "coverArt": 21,
+          "artistId": 7,
           "artist": "Captain Beefheart & His Magic Band",
           "name": "Lick My Decals Off, Baby",
-          "created": "2019-07-01T11:33:30.696105506+01:00"
+          "created": "2019-07-05T16:33:39.589691095+01:00"
         },
         {
           "id": 3,
@@ -50,38 +50,38 @@
           "artistId": 1,
           "artist": "Jah Wobble, The Edge & Holger Czukay",
           "name": "Snake Charmer",
-          "created": "2019-07-01T11:33:30.512724888+01:00"
+          "created": "2019-07-05T16:33:38.970382938+01:00"
         },
         {
-          "id": 21,
-          "coverArt": 21,
-          "artistId": 7,
+          "id": 19,
+          "coverArt": 19,
+          "artistId": 6,
           "artist": "Ten Years After",
           "name": "Ten Years After",
-          "created": "2019-07-01T11:33:30.675285785+01:00"
+          "created": "2019-07-05T16:33:39.514180103+01:00"
         },
         {
-          "id": 7,
-          "coverArt": 7,
-          "artistId": 3,
+          "id": 5,
+          "coverArt": 5,
+          "artistId": 2,
           "artist": "A Certain Ratio",
           "name": "The Graveyard and the Ballroom",
-          "created": "2019-07-01T11:33:30.544346174+01:00"
+          "created": "2019-07-05T16:33:39.020273091+01:00"
         },
         {
-          "id": 11,
-          "coverArt": 11,
-          "artistId": 4,
+          "id": 9,
+          "coverArt": 9,
+          "artistId": 3,
           "artist": "13th Floor Elevators",
           "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-07-01T11:33:30.600080603+01:00"
+          "created": "2019-07-05T16:33:39.189977898+01:00"
         },
         {
-          "id": 8,
-          "artistId": 3,
+          "id": 6,
+          "artistId": 2,
           "artist": "A Certain Ratio",
           "name": "To Each...",
-          "created": "2019-07-01T11:33:30.570884787+01:00"
+          "created": "2019-07-05T16:33:39.081646318+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 c5cfe26..2da7d62 100644
--- a/server/handler/test_data/test_get_album_list_two_newest
+++ b/server/handler/test_data/test_get_album_list_two_newest
@@ -4,84 +4,84 @@
     "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-07-01T11:33:30.696105506+01:00"
-        },
         {
           "id": 21,
           "coverArt": 21,
           "artistId": 7,
-          "artist": "Ten Years After",
-          "name": "Ten Years After",
-          "created": "2019-07-01T11:33:30.675285785+01:00"
+          "artist": "Captain Beefheart & His Magic Band",
+          "name": "Lick My Decals Off, Baby",
+          "created": "2019-07-05T16:33:39.589691095+01:00"
         },
         {
           "id": 19,
           "coverArt": 19,
           "artistId": 6,
+          "artist": "Ten Years After",
+          "name": "Ten Years After",
+          "created": "2019-07-05T16:33:39.514180103+01:00"
+        },
+        {
+          "id": 17,
+          "coverArt": 17,
+          "artistId": 5,
           "artist": "Swell Maps",
           "name": "A Trip to Marineville",
-          "created": "2019-07-01T11:33:30.659201596+01:00"
+          "created": "2019-07-05T16:33:39.456124086+01:00"
         },
         {
-          "id": 18,
-          "coverArt": 18,
-          "artistId": 6,
+          "id": 16,
+          "coverArt": 16,
+          "artistId": 5,
           "artist": "Swell Maps",
           "name": "Jane From Occupied Europe",
-          "created": "2019-07-01T11:33:30.634997537+01:00"
+          "created": "2019-07-05T16:33:39.401584248+01:00"
         },
         {
-          "id": 15,
-          "coverArt": 15,
-          "artistId": 5,
+          "id": 13,
+          "coverArt": 13,
+          "artistId": 4,
           "artist": "Anikas",
           "name": "Anika",
-          "created": "2019-07-01T11:33:30.625217653+01:00"
+          "created": "2019-07-05T16:33:39.295969241+01:00"
         },
         {
-          "id": 11,
-          "coverArt": 11,
-          "artistId": 4,
+          "id": 9,
+          "coverArt": 9,
+          "artistId": 3,
           "artist": "13th Floor Elevators",
           "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-07-01T11:33:30.600080603+01:00"
-        },
-        {
-          "id": 10,
-          "coverArt": 10,
-          "artistId": 4,
-          "artist": "13th Floor Elevators",
-          "name": "Easter Everywhere",
-          "created": "2019-07-01T11:33:30.58134155+01:00"
+          "created": "2019-07-05T16:33:39.189977898+01:00"
         },
         {
           "id": 8,
+          "coverArt": 8,
           "artistId": 3,
-          "artist": "A Certain Ratio",
-          "name": "To Each...",
-          "created": "2019-07-01T11:33:30.570884787+01:00"
+          "artist": "13th Floor Elevators",
+          "name": "Easter Everywhere",
+          "created": "2019-07-05T16:33:39.13742584+01:00"
         },
         {
-          "id": 7,
-          "coverArt": 7,
-          "artistId": 3,
+          "id": 6,
+          "artistId": 2,
           "artist": "A Certain Ratio",
-          "name": "The Graveyard and the Ballroom",
-          "created": "2019-07-01T11:33:30.544346174+01:00"
+          "name": "To Each...",
+          "created": "2019-07-05T16:33:39.081646318+01:00"
         },
         {
           "id": 5,
           "coverArt": 5,
           "artistId": 2,
-          "artist": "Dead Moon",
-          "name": "Unknown Passage",
-          "created": "2019-07-01T11:33:30.528889187+01:00"
+          "artist": "A Certain Ratio",
+          "name": "The Graveyard and the Ballroom",
+          "created": "2019-07-05T16:33:39.020273091+01:00"
+        },
+        {
+          "id": 3,
+          "coverArt": 3,
+          "artistId": 1,
+          "artist": "Jah Wobble, The Edge & Holger Czukay",
+          "name": "Snake Charmer",
+          "created": "2019-07-05T16:33:38.970382938+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 3b2707e..3f19f87 100644
--- a/server/handler/test_data/test_get_album_list_two_random
+++ b/server/handler/test_data/test_get_album_list_two_random
@@ -4,92 +4,84 @@
     "version": "1.9.0",
     "albumList2": {
       "album": [
-        {
-          "id": 8,
-          "artistId": 3,
-          "artist": "A Certain Ratio",
-          "name": "To Each...",
-          "created": "2019-07-01T11:33:30.570884787+01:00"
-        },
-        {
-          "id": 5,
-          "coverArt": 5,
-          "artistId": 2,
-          "artist": "Dead Moon",
-          "name": "Unknown Passage",
-          "created": "2019-07-01T11:33:30.528889187+01:00"
-        },
-        {
-          "id": 10,
-          "coverArt": 10,
-          "artistId": 4,
-          "artist": "13th Floor Elevators",
-          "name": "Easter Everywhere",
-          "created": "2019-07-01T11:33:30.58134155+01:00"
-        },
-        {
-          "id": 7,
-          "coverArt": 7,
-          "artistId": 3,
-          "artist": "A Certain Ratio",
-          "name": "The Graveyard and the Ballroom",
-          "created": "2019-07-01T11:33:30.544346174+01:00"
-        },
-        {
-          "id": 15,
-          "coverArt": 15,
-          "artistId": 5,
-          "artist": "Anikas",
-          "name": "Anika",
-          "created": "2019-07-01T11:33:30.625217653+01:00"
-        },
         {
           "id": 3,
           "coverArt": 3,
           "artistId": 1,
           "artist": "Jah Wobble, The Edge & Holger Czukay",
           "name": "Snake Charmer",
-          "created": "2019-07-01T11:33:30.512724888+01:00"
+          "created": "2019-07-05T16:33:38.970382938+01:00"
+        },
+        {
+          "id": 13,
+          "coverArt": 13,
+          "artistId": 4,
+          "artist": "Anikas",
+          "name": "Anika",
+          "created": "2019-07-05T16:33:39.295969241+01:00"
+        },
+        {
+          "id": 16,
+          "coverArt": 16,
+          "artistId": 5,
+          "artist": "Swell Maps",
+          "name": "Jane From Occupied Europe",
+          "created": "2019-07-05T16:33:39.401584248+01:00"
+        },
+        {
+          "id": 5,
+          "coverArt": 5,
+          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "name": "The Graveyard and the Ballroom",
+          "created": "2019-07-05T16:33:39.020273091+01:00"
+        },
+        {
+          "id": 17,
+          "coverArt": 17,
+          "artistId": 5,
+          "artist": "Swell Maps",
+          "name": "A Trip to Marineville",
+          "created": "2019-07-05T16:33:39.456124086+01:00"
+        },
+        {
+          "id": 8,
+          "coverArt": 8,
+          "artistId": 3,
+          "artist": "13th Floor Elevators",
+          "name": "Easter Everywhere",
+          "created": "2019-07-05T16:33:39.13742584+01:00"
         },
         {
           "id": 19,
           "coverArt": 19,
           "artistId": 6,
-          "artist": "Swell Maps",
-          "name": "A Trip to Marineville",
-          "created": "2019-07-01T11:33:30.659201596+01:00"
+          "artist": "Ten Years After",
+          "name": "Ten Years After",
+          "created": "2019-07-05T16:33:39.514180103+01:00"
         },
         {
-          "id": 18,
-          "coverArt": 18,
-          "artistId": 6,
-          "artist": "Swell Maps",
-          "name": "Jane From Occupied Europe",
-          "created": "2019-07-01T11:33:30.634997537+01:00"
+          "id": 6,
+          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "name": "To Each...",
+          "created": "2019-07-05T16:33:39.081646318+01:00"
+        },
+        {
+          "id": 9,
+          "coverArt": 9,
+          "artistId": 3,
+          "artist": "13th Floor Elevators",
+          "name": "The Psychedelic Sounds of the 13th Floor Elevators",
+          "created": "2019-07-05T16:33:39.189977898+01:00"
         },
         {
           "id": 21,
           "coverArt": 21,
           "artistId": 7,
-          "artist": "Ten Years After",
-          "name": "Ten Years After",
-          "created": "2019-07-01T11:33:30.675285785+01:00"
-        },
-        {
-          "id": 11,
-          "coverArt": 11,
-          "artistId": 4,
-          "artist": "13th Floor Elevators",
-          "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-07-01T11:33:30.600080603+01:00"
-        },
-        {
-          "id": 23,
-          "coverArt": 23,
-          "artistId": 8,
           "artist": "Captain Beefheart & His Magic Band",
           "name": "Lick My Decals Off, Baby",
-          "created": "2019-07-01T11:33:30.696105506+01:00"
+          "created": "2019-07-05T16:33:39.589691095+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 77201a0..afc0350 100644
--- a/server/handler/test_data/test_get_album_with_cover
+++ b/server/handler/test_data/test_get_album_with_cover
@@ -8,7 +8,7 @@
       "artistId": 1,
       "artist": "Jah Wobble, The Edge & Holger Czukay",
       "name": "Snake Charmer",
-      "created": "2019-07-01T11:33:30.512724888+01:00",
+      "created": "2019-07-05T16:33:38.970382938+01:00",
       "song": [
         {
           "album": "Snake Charmer",
@@ -18,7 +18,7 @@
           "bitRate": 882,
           "contentType": "audio/x-flac",
           "coverArt": 3,
-          "created": "2019-07-01T11:33:30.515509794+01:00",
+          "created": "2019-07-05T16:33:38.98072783+01:00",
           "duration": 372,
           "id": 1,
           "parent": 3,
@@ -38,7 +38,7 @@
           "bitRate": 814,
           "contentType": "audio/x-flac",
           "coverArt": 3,
-          "created": "2019-07-01T11:33:30.519525103+01:00",
+          "created": "2019-07-05T16:33:38.982389775+01:00",
           "duration": 523,
           "id": 3,
           "parent": 3,
@@ -58,7 +58,7 @@
           "bitRate": 745,
           "contentType": "audio/x-flac",
           "coverArt": 3,
-          "created": "2019-07-01T11:33:30.51733481+01:00",
+          "created": "2019-07-05T16:33:38.981622033+01:00",
           "duration": 331,
           "id": 2,
           "parent": 3,
@@ -78,7 +78,7 @@
           "bitRate": 976,
           "contentType": "audio/x-flac",
           "coverArt": 3,
-          "created": "2019-07-01T11:33:30.525219727+01:00",
+          "created": "2019-07-05T16:33:38.983911053+01:00",
           "duration": 227,
           "id": 5,
           "parent": 3,
@@ -98,7 +98,7 @@
           "bitRate": 884,
           "contentType": "audio/x-flac",
           "coverArt": 3,
-          "created": "2019-07-01T11:33:30.52108231+01:00",
+          "created": "2019-07-05T16:33:38.983156779+01:00",
           "duration": 418,
           "id": 4,
           "parent": 3,
diff --git a/server/handler/test_data/test_get_album_without_cover b/server/handler/test_data/test_get_album_without_cover
index 8f52a11..ae905b4 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-07-01T11:33:30.512216597+01:00"
+      "created": "2019-07-05T16:33:38.960789919+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 3d58d56..7526b65 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-07-01T11:33:30.512724888+01:00"
+          "created": "2019-07-05T16:33:38.970382938+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 096b3c0..96570ba 100644
--- a/server/handler/test_data/test_get_artist_id_three
+++ b/server/handler/test_data/test_get_artist_id_three
@@ -4,22 +4,23 @@
     "version": "1.9.0",
     "artist": {
       "id": 3,
-      "name": "A Certain Ratio",
+      "name": "13th Floor Elevators",
       "album": [
         {
-          "id": 7,
-          "coverArt": 7,
+          "id": 8,
+          "coverArt": 8,
           "artistId": 3,
-          "artist": "A Certain Ratio",
-          "name": "The Graveyard and the Ballroom",
-          "created": "2019-07-01T11:33:30.544346174+01:00"
+          "artist": "13th Floor Elevators",
+          "name": "Easter Everywhere",
+          "created": "2019-07-05T16:33:39.13742584+01:00"
         },
         {
-          "id": 8,
+          "id": 9,
+          "coverArt": 9,
           "artistId": 3,
-          "artist": "A Certain Ratio",
-          "name": "To Each...",
-          "created": "2019-07-01T11:33:30.570884787+01:00"
+          "artist": "13th Floor Elevators",
+          "name": "The Psychedelic Sounds of the 13th Floor Elevators",
+          "created": "2019-07-05T16:33:39.189977898+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 41f3491..3d1ba3c 100644
--- a/server/handler/test_data/test_get_artist_id_two
+++ b/server/handler/test_data/test_get_artist_id_two
@@ -4,15 +4,22 @@
     "version": "1.9.0",
     "artist": {
       "id": 2,
-      "name": "Dead Moon",
+      "name": "A Certain Ratio",
       "album": [
         {
           "id": 5,
           "coverArt": 5,
           "artistId": 2,
-          "artist": "Dead Moon",
-          "name": "Unknown Passage",
-          "created": "2019-07-01T11:33:30.528889187+01:00"
+          "artist": "A Certain Ratio",
+          "name": "The Graveyard and the Ballroom",
+          "created": "2019-07-05T16:33:39.020273091+01:00"
+        },
+        {
+          "id": 6,
+          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "name": "To Each...",
+          "created": "2019-07-05T16:33:39.081646318+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 359e0ae..8bdc67c 100644
--- a/server/handler/test_data/test_get_artists_no_args
+++ b/server/handler/test_data/test_get_artists_no_args
@@ -8,7 +8,7 @@
           "name": "#",
           "artist": [
             {
-              "id": 4,
+              "id": 3,
               "name": "13th Floor Elevators",
               "albumCount": 2
             }
@@ -18,12 +18,12 @@
           "name": "a",
           "artist": [
             {
-              "id": 3,
+              "id": 2,
               "name": "A Certain Ratio",
               "albumCount": 2
             },
             {
-              "id": 5,
+              "id": 4,
               "name": "Anikas",
               "albumCount": 1
             }
@@ -33,22 +33,12 @@
           "name": "c",
           "artist": [
             {
-              "id": 8,
+              "id": 7,
               "name": "Captain Beefheart & His Magic Band",
               "albumCount": 1
             }
           ]
         },
-        {
-          "name": "d",
-          "artist": [
-            {
-              "id": 2,
-              "name": "Dead Moon",
-              "albumCount": 1
-            }
-          ]
-        },
         {
           "name": "j",
           "artist": [
@@ -63,7 +53,7 @@
           "name": "s",
           "artist": [
             {
-              "id": 6,
+              "id": 5,
               "name": "Swell Maps",
               "albumCount": 2
             }
@@ -73,7 +63,7 @@
           "name": "t",
           "artist": [
             {
-              "id": 7,
+              "id": 6,
               "name": "Ten Years After",
               "albumCount": 1
             }
diff --git a/server/handler/test_data/test_get_indexes_no_args b/server/handler/test_data/test_get_indexes_no_args
index c9adfd1..f9838c1 100644
--- a/server/handler/test_data/test_get_indexes_no_args
+++ b/server/handler/test_data/test_get_indexes_no_args
@@ -9,12 +9,12 @@
           "name": "#",
           "artist": [
             {
-              "id": 9,
+              "id": 7,
               "name": "13th Floor Lowervators",
               "albumCount": 2
             },
             {
-              "id": 12,
+              "id": 10,
               "name": "___Anika",
               "albumCount": 2
             }
@@ -24,7 +24,7 @@
           "name": "a",
           "artist": [
             {
-              "id": 6,
+              "id": 4,
               "name": "A Certain Ratio",
               "albumCount": 2
             }
@@ -34,22 +34,12 @@
           "name": "c",
           "artist": [
             {
-              "id": 22,
+              "id": 20,
               "name": "Captain Beefheart",
               "albumCount": 1
             }
           ]
         },
-        {
-          "name": "d",
-          "artist": [
-            {
-              "id": 4,
-              "name": "Dead Moon",
-              "albumCount": 1
-            }
-          ]
-        },
         {
           "name": "j",
           "artist": [
@@ -64,7 +54,7 @@
           "name": "s",
           "artist": [
             {
-              "id": 17,
+              "id": 15,
               "name": "Swell Maps",
               "albumCount": 2
             }
@@ -74,7 +64,7 @@
           "name": "t",
           "artist": [
             {
-              "id": 20,
+              "id": 18,
               "name": "Ten Years After",
               "albumCount": 1
             }
diff --git a/server/handler/test_data/test_search_three_q_13 b/server/handler/test_data/test_search_three_q_13
index e3417a7..3fb0098 100644
--- a/server/handler/test_data/test_search_three_q_13
+++ b/server/handler/test_data/test_search_three_q_13
@@ -5,18 +5,18 @@
     "searchResult3": {
       "artist": [
         {
-          "id": 4,
+          "id": 3,
           "name": "13th Floor Elevators"
         }
       ],
       "album": [
         {
-          "id": 11,
-          "coverArt": 11,
-          "artistId": 4,
+          "id": 9,
+          "coverArt": 9,
+          "artistId": 3,
           "artist": "13th Floor Elevators",
           "name": "The Psychedelic Sounds of the 13th Floor Elevators",
-          "created": "2019-07-01T11:33:30.600080603+01:00"
+          "created": "2019-07-05T16:33:39.189977898+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 8259e5b..4fc6285 100644
--- a/server/handler/test_data/test_search_three_q_ani
+++ b/server/handler/test_data/test_search_three_q_ani
@@ -5,18 +5,18 @@
     "searchResult3": {
       "artist": [
         {
-          "id": 5,
+          "id": 4,
           "name": "Anikas"
         }
       ],
       "album": [
         {
-          "id": 15,
-          "coverArt": 15,
-          "artistId": 5,
+          "id": 13,
+          "coverArt": 13,
+          "artistId": 4,
           "artist": "Anikas",
           "name": "Anika",
-          "created": "2019-07-01T11:33:30.625217653+01:00"
+          "created": "2019-07-05T16:33:39.295969241+01:00"
         }
       ]
     }
diff --git a/server/handler/test_data/test_search_three_q_cert b/server/handler/test_data/test_search_three_q_cert
index caf05c7..dcfe31d 100644
--- a/server/handler/test_data/test_search_three_q_cert
+++ b/server/handler/test_data/test_search_three_q_cert
@@ -5,7 +5,7 @@
     "searchResult3": {
       "artist": [
         {
-          "id": 3,
+          "id": 2,
           "name": "A Certain Ratio"
         }
       ]
diff --git a/server/handler/test_data/test_search_two_q_13 b/server/handler/test_data/test_search_two_q_13
index 4d4bda6..9322ef8 100644
--- a/server/handler/test_data/test_search_two_q_13
+++ b/server/handler/test_data/test_search_two_q_13
@@ -5,18 +5,18 @@
     "searchResult2": {
       "artist": [
         {
-          "id": 9,
+          "id": 7,
           "parent": 1,
           "name": "13th Floor Lowervators"
         }
       ],
       "album": [
         {
-          "coverArt": 11,
+          "coverArt": 9,
           "created": "0001-01-01T00:00:00Z",
-          "id": 11,
+          "id": 9,
           "isDir": true,
-          "parent": 9,
+          "parent": 7,
           "title": "(1966) The Psychedelic Sounds of the 13th Floor Elevators"
         }
       ],
@@ -26,11 +26,11 @@
           "artist": "A Certain Ratio",
           "bitRate": 894,
           "contentType": "audio/x-flac",
-          "coverArt": 7,
+          "coverArt": 5,
           "created": "0001-01-01T00:00:00Z",
           "duration": 332,
-          "id": 16,
-          "parent": 7,
+          "id": 6,
+          "parent": 5,
           "path": "A Certain Ratio/(1994) The Graveyard and the Ballroom/13.14 Flight.flac",
           "size": 37302417,
           "suffix": "flac",
@@ -44,11 +44,11 @@
           "artist": "13th Floor Elevators",
           "bitRate": 244,
           "contentType": "audio/mpeg",
-          "coverArt": 11,
+          "coverArt": 9,
           "created": "0001-01-01T00:00:00Z",
           "duration": 154,
-          "id": 50,
-          "parent": 11,
+          "id": 40,
+          "parent": 9,
           "path": "13th Floor Lowervators/(1966) The Psychedelic Sounds of the 13th Floor Elevators/13.21 Before You Accuse Me.mp3",
           "size": 4722688,
           "suffix": "mp3",
@@ -62,11 +62,11 @@
           "artist": "Swell Maps",
           "bitRate": 1204,
           "contentType": "audio/x-flac",
-          "coverArt": 18,
+          "coverArt": 16,
           "created": "0001-01-01T00:00:00Z",
           "duration": 220,
-          "id": 86,
-          "parent": 18,
+          "id": 76,
+          "parent": 16,
           "path": "Swell Maps/(1980) Jane From Occupied Europe/13.16 Blenheim Shots.flac",
           "size": 33140852,
           "suffix": "flac",
@@ -80,11 +80,11 @@
           "artist": "Swell Maps",
           "bitRate": 295,
           "contentType": "audio/mpeg",
-          "coverArt": 19,
+          "coverArt": 17,
           "created": "0001-01-01T00:00:00Z",
           "duration": 463,
-          "id": 103,
-          "parent": 19,
+          "id": 93,
+          "parent": 17,
           "path": "Swell Maps/(1979) A Trip to Marineville/d01 13.14 Adventuring Into Basketry.mp3",
           "size": 17119309,
           "suffix": "mp3",
@@ -98,11 +98,11 @@
           "artist": "Ten Years After",
           "bitRate": 192,
           "contentType": "audio/ogg",
-          "coverArt": 21,
+          "coverArt": 19,
           "created": "0001-01-01T00:00:00Z",
           "duration": 433,
-          "id": 117,
-          "parent": 21,
+          "id": 107,
+          "parent": 19,
           "path": "Ten Years After/(1967) Ten Years After/13.15 Spider in My Web.ogg",
           "size": 10400948,
           "suffix": "ogg",
@@ -116,11 +116,11 @@
           "artist": "Captain Beefheart & His Magic Band",
           "bitRate": 160,
           "contentType": "audio/mpeg",
-          "coverArt": 23,
+          "coverArt": 21,
           "created": "0001-01-01T00:00:00Z",
           "duration": 152,
-          "id": 139,
-          "parent": 23,
+          "id": 129,
+          "parent": 21,
           "path": "Captain Beefheart/(1970) Lick My Decals Off, Bitch/13.15 Space-Age Couple.mp3",
           "size": 3054515,
           "suffix": "mp3",
diff --git a/server/handler/test_data/test_search_two_q_ani b/server/handler/test_data/test_search_two_q_ani
index 2ab697d..4930207 100644
--- a/server/handler/test_data/test_search_two_q_ani
+++ b/server/handler/test_data/test_search_two_q_ani
@@ -5,18 +5,18 @@
     "searchResult2": {
       "artist": [
         {
-          "id": 12,
+          "id": 10,
           "parent": 1,
           "name": "___Anika"
         }
       ],
       "album": [
         {
-          "coverArt": 15,
+          "coverArt": 13,
           "created": "0001-01-01T00:00:00Z",
-          "id": 15,
+          "id": 13,
           "isDir": true,
-          "parent": 14,
+          "parent": 12,
           "title": "(2010) Anika"
         }
       ]
diff --git a/server/handler/test_data/test_search_two_q_cert b/server/handler/test_data/test_search_two_q_cert
index 4625ac6..06a4b68 100644
--- a/server/handler/test_data/test_search_two_q_cert
+++ b/server/handler/test_data/test_search_two_q_cert
@@ -5,7 +5,7 @@
     "searchResult2": {
       "artist": [
         {
-          "id": 6,
+          "id": 4,
           "parent": 1,
           "name": "A Certain Ratio"
         }