diff --git a/server/ctrlsubsonic/testdata/db b/server/ctrlsubsonic/testdata/db
index e63ce8b..935d1b9 100644
Binary files a/server/ctrlsubsonic/testdata/db and b/server/ctrlsubsonic/testdata/db differ
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist b/server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist
index 3cc7e78..d223359 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "albumList": {
       "album": [
         {
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_alpha_name b/server/ctrlsubsonic/testdata/test_get_album_list_alpha_name
index 68069b7..c85bfd1 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_alpha_name
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_alpha_name
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "albumList": {
       "album": [
         {
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_newest b/server/ctrlsubsonic/testdata/test_get_album_list_newest
index 5e1979d..f43b58c 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_newest
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_newest
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "albumList": {
       "album": [
         {
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_random b/server/ctrlsubsonic/testdata/test_get_album_list_random
index 0dda704..9dec45c 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_random
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_random
@@ -3,18 +3,9 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "albumList": {
       "album": [
-        {
-          "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": 13,
           "coverArt": 13,
@@ -24,24 +15,6 @@
           "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": 21,
-          "coverArt": 21,
-          "artist": "Captain Beefheart",
-          "title": "(1970) Lick My Decals Off, Bitch",
-          "parent": 20,
-          "isDir": true,
-          "created": "0001-01-01T00:00:00Z"
-        },
         {
           "id": 19,
           "coverArt": 19,
@@ -61,11 +34,20 @@
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 17,
-          "coverArt": 17,
-          "artist": "Swell Maps",
-          "title": "(1979) A Trip to Marineville",
-          "parent": 15,
+          "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": 6,
+          "coverArt": 6,
+          "artist": "A Certain Ratio",
+          "title": "(1981) To EachOTHER.",
+          "parent": 4,
           "isDir": true,
           "created": "0001-01-01T00:00:00Z"
         },
@@ -78,6 +60,24 @@
           "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": 8,
           "coverArt": 8,
@@ -88,11 +88,11 @@
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": 6,
-          "coverArt": 6,
-          "artist": "A Certain Ratio",
-          "title": "(1981) To EachOTHER.",
-          "parent": 4,
+          "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"
         }
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 6c22014..9fb0a9f 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_artist
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_artist
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "albumList2": {
       "album": [
         {
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 c14489d..1356b9f 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_name
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_name
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "albumList2": {
       "album": [
         {
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_two_newest b/server/ctrlsubsonic/testdata/test_get_album_list_two_newest
index cf02460..cae6ea3 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_two_newest
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_two_newest
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "albumList2": {
       "album": [
         {
diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_two_random b/server/ctrlsubsonic/testdata/test_get_album_list_two_random
index 40b4624..a131231 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_list_two_random
+++ b/server/ctrlsubsonic/testdata/test_get_album_list_two_random
@@ -3,32 +3,17 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "albumList2": {
       "album": [
         {
-          "id": 8,
-          "coverArt": 8,
-          "artistId": 3,
-          "artist": "13th Floor Elevators",
-          "name": "Easter Everywhere",
-          "created": "2019-06-13T12:57:28.850090338+01:00"
-        },
-        {
-          "id": 6,
-          "artistId": 2,
-          "artist": "A Certain Ratio",
-          "name": "To Each...",
+          "id": 13,
+          "coverArt": 13,
+          "artistId": 4,
+          "artist": "Anikas",
+          "name": "Anika",
           "created": "2019-05-23T15:12:02.921473302+01:00"
         },
-        {
-          "id": 3,
-          "coverArt": 3,
-          "artistId": 1,
-          "artist": "Jah Wobble, The Edge & Holger Czukay",
-          "name": "Snake Charmer",
-          "created": "2019-05-16T22:10:52+01:00"
-        },
         {
           "id": 5,
           "coverArt": 5,
@@ -37,6 +22,21 @@
           "name": "The Graveyard and the Ballroom",
           "created": "2019-06-05T17:46:37.675917974+01:00"
         },
+        {
+          "id": 6,
+          "artistId": 2,
+          "artist": "A Certain Ratio",
+          "name": "To Each...",
+          "created": "2019-05-23T15:12:02.921473302+01:00"
+        },
+        {
+          "id": 17,
+          "coverArt": 17,
+          "artistId": 5,
+          "artist": "Swell Maps",
+          "name": "A Trip to Marineville",
+          "created": "2019-04-30T16:48:48+01:00"
+        },
         {
           "id": 21,
           "coverArt": 21,
@@ -45,22 +45,6 @@
           "name": "Lick My Decals Off, Baby",
           "created": "2019-06-10T19:26:30.944742894+01:00"
         },
-        {
-          "id": 16,
-          "coverArt": 16,
-          "artistId": 5,
-          "artist": "Swell Maps",
-          "name": "Jane From Occupied Europe",
-          "created": "2019-04-30T16:48:48+01:00"
-        },
-        {
-          "id": 13,
-          "coverArt": 13,
-          "artistId": 4,
-          "artist": "Anikas",
-          "name": "Anika",
-          "created": "2019-05-23T15:12:02.921473302+01:00"
-        },
         {
           "id": 19,
           "coverArt": 19,
@@ -69,6 +53,30 @@
           "name": "Ten Years After",
           "created": "2019-04-30T16:48:30+01:00"
         },
+        {
+          "id": 16,
+          "coverArt": 16,
+          "artistId": 5,
+          "artist": "Swell Maps",
+          "name": "Jane From Occupied Europe",
+          "created": "2019-04-30T16:48:48+01:00"
+        },
+        {
+          "id": 3,
+          "coverArt": 3,
+          "artistId": 1,
+          "artist": "Jah Wobble, The Edge & Holger Czukay",
+          "name": "Snake Charmer",
+          "created": "2019-05-16T22:10:52+01:00"
+        },
+        {
+          "id": 8,
+          "coverArt": 8,
+          "artistId": 3,
+          "artist": "13th Floor Elevators",
+          "name": "Easter Everywhere",
+          "created": "2019-06-13T12:57:28.850090338+01:00"
+        },
         {
           "id": 9,
           "coverArt": 9,
@@ -76,14 +84,6 @@
           "artist": "13th Floor Elevators",
           "name": "The Psychedelic Sounds of the 13th Floor Elevators",
           "created": "2019-06-13T12:57:24.306717554+01:00"
-        },
-        {
-          "id": 17,
-          "coverArt": 17,
-          "artistId": 5,
-          "artist": "Swell Maps",
-          "name": "A Trip to Marineville",
-          "created": "2019-04-30T16:48:48+01:00"
         }
       ]
     }
diff --git a/server/ctrlsubsonic/testdata/test_get_album_with_cover b/server/ctrlsubsonic/testdata/test_get_album_with_cover
index 1670050..19e4e8f 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_with_cover
+++ b/server/ctrlsubsonic/testdata/test_get_album_with_cover
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "album": {
       "id": 3,
       "coverArt": 3,
diff --git a/server/ctrlsubsonic/testdata/test_get_album_without_cover b/server/ctrlsubsonic/testdata/test_get_album_without_cover
index 1d0c709..bc011b2 100644
--- a/server/ctrlsubsonic/testdata/test_get_album_without_cover
+++ b/server/ctrlsubsonic/testdata/test_get_album_without_cover
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "album": {
       "id": 2,
       "created": "2019-05-16T22:10:21+01:00"
diff --git a/server/ctrlsubsonic/testdata/test_get_artist_id_one b/server/ctrlsubsonic/testdata/test_get_artist_id_one
index 61e0149..ed76989 100644
--- a/server/ctrlsubsonic/testdata/test_get_artist_id_one
+++ b/server/ctrlsubsonic/testdata/test_get_artist_id_one
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "artist": {
       "id": 1,
       "name": "Jah Wobble, The Edge & Holger Czukay",
diff --git a/server/ctrlsubsonic/testdata/test_get_artist_id_three b/server/ctrlsubsonic/testdata/test_get_artist_id_three
index 256f61b..f664961 100644
--- a/server/ctrlsubsonic/testdata/test_get_artist_id_three
+++ b/server/ctrlsubsonic/testdata/test_get_artist_id_three
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "artist": {
       "id": 3,
       "name": "13th Floor Elevators",
diff --git a/server/ctrlsubsonic/testdata/test_get_artist_id_two b/server/ctrlsubsonic/testdata/test_get_artist_id_two
index efd610c..6e346b0 100644
--- a/server/ctrlsubsonic/testdata/test_get_artist_id_two
+++ b/server/ctrlsubsonic/testdata/test_get_artist_id_two
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "artist": {
       "id": 2,
       "name": "A Certain Ratio",
diff --git a/server/ctrlsubsonic/testdata/test_get_artists_no_args b/server/ctrlsubsonic/testdata/test_get_artists_no_args
index 2ecb6a8..87bad00 100644
--- a/server/ctrlsubsonic/testdata/test_get_artists_no_args
+++ b/server/ctrlsubsonic/testdata/test_get_artists_no_args
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "artists": {
       "index": [
         {
diff --git a/server/ctrlsubsonic/testdata/test_get_indexes_no_args b/server/ctrlsubsonic/testdata/test_get_indexes_no_args
index 57ecd89..a73f389 100644
--- a/server/ctrlsubsonic/testdata/test_get_indexes_no_args
+++ b/server/ctrlsubsonic/testdata/test_get_indexes_no_args
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "indexes": {
       "lastModified": 0,
       "index": [
diff --git a/server/ctrlsubsonic/testdata/test_get_music_directory_with_tracks b/server/ctrlsubsonic/testdata/test_get_music_directory_with_tracks
index 1083367..ee2626e 100644
--- a/server/ctrlsubsonic/testdata/test_get_music_directory_with_tracks
+++ b/server/ctrlsubsonic/testdata/test_get_music_directory_with_tracks
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "directory": {
       "id": 3,
       "parent": 2,
diff --git a/server/ctrlsubsonic/testdata/test_get_music_directory_without_tracks b/server/ctrlsubsonic/testdata/test_get_music_directory_without_tracks
index de4c8ad..e8edfd3 100644
--- a/server/ctrlsubsonic/testdata/test_get_music_directory_without_tracks
+++ b/server/ctrlsubsonic/testdata/test_get_music_directory_without_tracks
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "directory": {
       "id": 2,
       "parent": 1,
diff --git a/server/ctrlsubsonic/testdata/test_search_three_q_13 b/server/ctrlsubsonic/testdata/test_search_three_q_13
index 5b4262c..633c970 100644
--- a/server/ctrlsubsonic/testdata/test_search_three_q_13
+++ b/server/ctrlsubsonic/testdata/test_search_three_q_13
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "searchResult3": {
       "artist": [
         {
diff --git a/server/ctrlsubsonic/testdata/test_search_three_q_ani b/server/ctrlsubsonic/testdata/test_search_three_q_ani
index 9ccbc13..3222d66 100644
--- a/server/ctrlsubsonic/testdata/test_search_three_q_ani
+++ b/server/ctrlsubsonic/testdata/test_search_three_q_ani
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "searchResult3": {
       "artist": [
         {
diff --git a/server/ctrlsubsonic/testdata/test_search_three_q_cert b/server/ctrlsubsonic/testdata/test_search_three_q_cert
index b8afbef..3eb6ab7 100644
--- a/server/ctrlsubsonic/testdata/test_search_three_q_cert
+++ b/server/ctrlsubsonic/testdata/test_search_three_q_cert
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "searchResult3": {
       "artist": [
         {
diff --git a/server/ctrlsubsonic/testdata/test_search_two_q_13 b/server/ctrlsubsonic/testdata/test_search_two_q_13
index 5ec16bf..4046767 100644
--- a/server/ctrlsubsonic/testdata/test_search_two_q_13
+++ b/server/ctrlsubsonic/testdata/test_search_two_q_13
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "searchResult2": {
       "artist": [
         {
diff --git a/server/ctrlsubsonic/testdata/test_search_two_q_ani b/server/ctrlsubsonic/testdata/test_search_two_q_ani
index d79ba5c..2fba4ef 100644
--- a/server/ctrlsubsonic/testdata/test_search_two_q_ani
+++ b/server/ctrlsubsonic/testdata/test_search_two_q_ani
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "searchResult2": {
       "artist": [
         {
diff --git a/server/ctrlsubsonic/testdata/test_search_two_q_cert b/server/ctrlsubsonic/testdata/test_search_two_q_cert
index 24af193..75f01de 100644
--- a/server/ctrlsubsonic/testdata/test_search_two_q_cert
+++ b/server/ctrlsubsonic/testdata/test_search_two_q_cert
@@ -3,7 +3,7 @@
     "status": "ok",
     "version": "1.9.0",
     "type": "gonic",
-    "gonicVersion": "v0.5.2",
+    "gonicVersion": "v0.6.0",
     "searchResult2": {
       "artist": [
         {
diff --git a/version/version.go b/version/version.go
index 372edd1..9f2605c 100644
--- a/version/version.go
+++ b/version/version.go
@@ -1,5 +1,5 @@
 // generated by `_do_bump_version` script in project root
-// Thu Jan 23 17:19:15 GMT 2020
+// Mon Jan 27 17:03:45 GMT 2020
 // DO NOT EDIT
 
 package version
@@ -8,4 +8,4 @@ const NAME = "gonic"
 const NAME_UPPER = "GONIC"
 const NAME_EMBED = "gonicembed"
 const NAME_SCAN = "gonicscan"
-const VERSION = "v0.5.2"
+const VERSION = "v0.6.0"