diff --git a/persistence/album_repository.go b/persistence/album_repository.go
index 577b0473..898fa3e9 100644
--- a/persistence/album_repository.go
+++ b/persistence/album_repository.go
@@ -56,14 +56,14 @@ func (r *albumRepository) Get(id string) (*model.Album, error) {
 
 func (r *albumRepository) FindByArtist(artistId string) (model.Albums, error) {
 	sq := r.selectAlbum().Where(Eq{"artist_id": artistId}).OrderBy("year")
-	var res model.Albums
+	res := model.Albums{}
 	err := r.queryAll(sq, &res)
 	return res, err
 }
 
 func (r *albumRepository) GetAll(options ...model.QueryOptions) (model.Albums, error) {
 	sq := r.selectAlbum(options...)
-	var res model.Albums
+	res := model.Albums{}
 	err := r.queryAll(sq, &res)
 	return res, err
 }
@@ -81,7 +81,7 @@ func (r *albumRepository) GetRandom(options ...model.QueryOptions) (model.Albums
 	if err != nil {
 		return nil, err
 	}
-	var results model.Albums
+	results := model.Albums{}
 	_, err = r.ormer.Raw(sql, args...).QueryRows(&results)
 	return results, err
 }
@@ -151,13 +151,13 @@ func (r *albumRepository) PurgeEmpty() error {
 
 func (r *albumRepository) GetStarred(options ...model.QueryOptions) (model.Albums, error) {
 	sq := r.selectAlbum(options...).Where("starred = true")
-	var starred model.Albums
+	starred := model.Albums{}
 	err := r.queryAll(sq, &starred)
 	return starred, err
 }
 
 func (r *albumRepository) Search(q string, offset int, size int) (model.Albums, error) {
-	var results model.Albums
+	results := model.Albums{}
 	err := r.doSearch(q, offset, size, &results, "name")
 	return results, err
 }
diff --git a/persistence/artist_repository.go b/persistence/artist_repository.go
index f9e1d58e..777b0d59 100644
--- a/persistence/artist_repository.go
+++ b/persistence/artist_repository.go
@@ -69,7 +69,7 @@ func (r *artistRepository) Get(id string) (*model.Artist, error) {
 
 func (r *artistRepository) GetAll(options ...model.QueryOptions) (model.Artists, error) {
 	sel := r.selectArtist(options...)
-	var res model.Artists
+	res := model.Artists{}
 	err := r.queryAll(sel, &res)
 	return res, err
 }
@@ -158,7 +158,7 @@ where f.artist_id in ('%s') group by f.artist_id order by f.id`, strings.Join(id
 
 func (r *artistRepository) GetStarred(options ...model.QueryOptions) (model.Artists, error) {
 	sq := r.selectArtist(options...).Where("starred = true")
-	var starred model.Artists
+	starred := model.Artists{}
 	err := r.queryAll(sq, &starred)
 	return starred, err
 }
@@ -169,7 +169,7 @@ func (r *artistRepository) PurgeEmpty() error {
 }
 
 func (r *artistRepository) Search(q string, offset int, size int) (model.Artists, error) {
-	var results model.Artists
+	results := model.Artists{}
 	err := r.doSearch(q, offset, size, &results, "name")
 	return results, err
 }
diff --git a/persistence/genre_repository.go b/persistence/genre_repository.go
index 08f5efb2..c4232feb 100644
--- a/persistence/genre_repository.go
+++ b/persistence/genre_repository.go
@@ -27,7 +27,7 @@ func (r genreRepository) GetAll() (model.Genres, error) {
 	if err != nil {
 		return nil, err
 	}
-	var res model.Genres
+	res := model.Genres{}
 	_, err = r.ormer.Raw(sql, args).QueryRows(&res)
 	return res, err
 }
diff --git a/persistence/mediafile_repository.go b/persistence/mediafile_repository.go
index a600ea0e..9bf9f191 100644
--- a/persistence/mediafile_repository.go
+++ b/persistence/mediafile_repository.go
@@ -50,28 +50,28 @@ func (r mediaFileRepository) Get(id string) (*model.MediaFile, error) {
 
 func (r mediaFileRepository) GetAll(options ...model.QueryOptions) (model.MediaFiles, error) {
 	sq := r.selectMediaFile(options...)
-	var res model.MediaFiles
+	res := model.MediaFiles{}
 	err := r.queryAll(sq, &res)
 	return res, err
 }
 
 func (r mediaFileRepository) FindByAlbum(albumId string) (model.MediaFiles, error) {
 	sel := r.selectMediaFile().Where(Eq{"album_id": albumId}).OrderBy("disc_number", "track_number")
-	var res model.MediaFiles
+	res := model.MediaFiles{}
 	err := r.queryAll(sel, &res)
 	return res, err
 }
 
 func (r mediaFileRepository) FindByPath(path string) (model.MediaFiles, error) {
 	sel := r.selectMediaFile().Where(Like{"path": path + "%"})
-	var res model.MediaFiles
+	res := model.MediaFiles{}
 	err := r.queryAll(sel, &res)
 	return res, err
 }
 
 func (r mediaFileRepository) GetStarred(options ...model.QueryOptions) (model.MediaFiles, error) {
 	sq := r.selectMediaFile(options...).Where("starred = true")
-	var starred model.MediaFiles
+	starred := model.MediaFiles{}
 	err := r.queryAll(sq, &starred)
 	return starred, err
 }
@@ -89,7 +89,7 @@ func (r mediaFileRepository) GetRandom(options ...model.QueryOptions) (model.Med
 	if err != nil {
 		return nil, err
 	}
-	var results model.MediaFiles
+	results := model.MediaFiles{}
 	_, err = r.ormer.Raw(sql, args...).QueryRows(&results)
 	return results, err
 }
@@ -105,7 +105,7 @@ func (r mediaFileRepository) DeleteByPath(path string) error {
 }
 
 func (r mediaFileRepository) Search(q string, offset int, size int) (model.MediaFiles, error) {
-	var results model.MediaFiles
+	results := model.MediaFiles{}
 	err := r.doSearch(q, offset, size, &results, "title")
 	return results, err
 }
diff --git a/persistence/mediafile_repository_test.go b/persistence/mediafile_repository_test.go
index 1dd0c1ea..c622d8b6 100644
--- a/persistence/mediafile_repository_test.go
+++ b/persistence/mediafile_repository_test.go
@@ -45,7 +45,7 @@ var _ = Describe("MediaRepository", func() {
 	})
 
 	It("returns empty array when no tracks are found", func() {
-		Expect(mr.FindByAlbum("67")).To(Equal(model.MediaFiles(nil)))
+		Expect(mr.FindByAlbum("67")).To(Equal(model.MediaFiles{}))
 	})
 
 	It("finds tracks by path", func() {
diff --git a/persistence/playlist_repository.go b/persistence/playlist_repository.go
index 1f50667e..3f32042e 100644
--- a/persistence/playlist_repository.go
+++ b/persistence/playlist_repository.go
@@ -64,7 +64,7 @@ func (r *playlistRepository) GetWithTracks(id string) (*model.Playlist, error) {
 	}
 	mfRepo := NewMediaFileRepository(r.ctx, r.ormer)
 	pls.Duration = 0
-	var newTracks model.MediaFiles
+	newTracks := model.MediaFiles{}
 	for _, t := range pls.Tracks {
 		mf, err := mfRepo.Get(t.ID)
 		if err != nil {
diff --git a/persistence/sql_repository.go b/persistence/sql_repository.go
index 35c355e1..7e06ff67 100644
--- a/persistence/sql_repository.go
+++ b/persistence/sql_repository.go
@@ -197,7 +197,7 @@ func (r sqlRepository) parseRestOptions(options ...rest.QueryOptions) model.Quer
 		if len(options[0].Filters) > 0 {
 			filters := And{}
 			for f, v := range options[0].Filters {
-				qo.Filters = append(filters, Like{f: fmt.Sprintf("%s%%", v)})
+				filters = append(filters, Like{f: fmt.Sprintf("%s%%", v)})
 			}
 			qo.Filters = filters
 		}
diff --git a/persistence/user_repository.go b/persistence/user_repository.go
index 39fbbf5b..c03d768a 100644
--- a/persistence/user_repository.go
+++ b/persistence/user_repository.go
@@ -37,7 +37,7 @@ func (r *userRepository) Get(id string) (*model.User, error) {
 
 func (r *userRepository) GetAll(options ...model.QueryOptions) (model.Users, error) {
 	sel := r.newSelect(options...).Columns("*")
-	var res model.Users
+	res := model.Users{}
 	err := r.queryAll(sel, &res)
 	return res, err
 }