diff --git a/dailyplayerstats/repository/pg_repository.go b/dailyplayerstats/repository/pg_repository.go
index bdfe65c..ee385a2 100644
--- a/dailyplayerstats/repository/pg_repository.go
+++ b/dailyplayerstats/repository/pg_repository.go
@@ -22,7 +22,7 @@ func NewPGRepository(db *pg.DB) dailyplayerstats.Repository {
 
 func (repo *pgRepository) Fetch(ctx context.Context, cfg dailyplayerstats.FetchConfig) ([]*twmodel.DailyPlayerStats, int, error) {
 	var err error
-	var data []*twmodel.DailyPlayerStats
+	data := make([]*twmodel.DailyPlayerStats, 0)
 	total := 0
 	query := repo.
 		WithParam("SERVER", pg.Safe(cfg.Server)).
diff --git a/dailytribestats/repository/pg_repository.go b/dailytribestats/repository/pg_repository.go
index 36a7cc7..00c2d88 100644
--- a/dailytribestats/repository/pg_repository.go
+++ b/dailytribestats/repository/pg_repository.go
@@ -22,7 +22,7 @@ func NewPGRepository(db *pg.DB) dailytribestats.Repository {
 
 func (repo *pgRepository) Fetch(ctx context.Context, cfg dailytribestats.FetchConfig) ([]*twmodel.DailyTribeStats, int, error) {
 	var err error
-	var data []*twmodel.DailyTribeStats
+	data := make([]*twmodel.DailyTribeStats, 0)
 	total := 0
 	query := repo.
 		WithParam("SERVER", pg.Safe(cfg.Server)).
diff --git a/ennoblement/repository/pg_repository.go b/ennoblement/repository/pg_repository.go
index 0b95240..2e1578a 100644
--- a/ennoblement/repository/pg_repository.go
+++ b/ennoblement/repository/pg_repository.go
@@ -23,7 +23,7 @@ func NewPGRepository(db *pg.DB) ennoblement.Repository {
 func (repo *pgRepository) Fetch(ctx context.Context, cfg ennoblement.FetchConfig) ([]*twmodel.Ennoblement, int, error) {
 	var err error
 	total := 0
-	var data []*twmodel.Ennoblement
+	data := make([]*twmodel.Ennoblement, 0)
 	query := repo.
 		WithParam("SERVER", pg.Safe(cfg.Server)).
 		Model(&data).
diff --git a/player/repository/pg_repository.go b/player/repository/pg_repository.go
index b62d741..978d0ff 100644
--- a/player/repository/pg_repository.go
+++ b/player/repository/pg_repository.go
@@ -23,7 +23,7 @@ func NewPGRepository(db *pg.DB) player.Repository {
 
 func (repo *pgRepository) Fetch(ctx context.Context, cfg player.FetchConfig) ([]*twmodel.Player, int, error) {
 	var err error
-	var data []*twmodel.Player
+	data := make([]*twmodel.Player, 0)
 	total := 0
 	query := repo.
 		WithParam("SERVER", pg.Safe(cfg.Server)).
@@ -60,7 +60,7 @@ type fetchPlayerServersQueryResult struct {
 }
 
 func (repo *pgRepository) FetchNameChanges(ctx context.Context, code twmodel.VersionCode, playerID ...int) (map[int][]*twmodel.PlayerNameChange, error) {
-	var data []*twmodel.PlayerNameChange
+	data := make([]*twmodel.PlayerNameChange, 0)
 	if err := repo.Model(&data).
 		Context(ctx).
 		Where("version_code = ?", code).
@@ -78,7 +78,7 @@ func (repo *pgRepository) FetchNameChanges(ctx context.Context, code twmodel.Ver
 }
 
 func (repo *pgRepository) FetchPlayerServers(ctx context.Context, code twmodel.VersionCode, playerID ...int) (map[int][]string, error) {
-	var data []*fetchPlayerServersQueryResult
+	data := make([]*fetchPlayerServersQueryResult, 0)
 	if err := repo.Model(&twmodel.PlayerToServer{}).
 		Context(ctx).
 		Column("player_id").
@@ -110,7 +110,6 @@ func (repo *pgRepository) SearchPlayer(ctx context.Context, cfg player.SearchPla
 	}
 
 	var query *orm.Query
-	var res []*twmodel.FoundPlayer
 	whereClause := "player.id = ?1 OR player.name ILIKE ?0"
 	if cfg.ID <= 0 {
 		whereClause = "player.name ILIKE ?0"
@@ -136,6 +135,7 @@ func (repo *pgRepository) SearchPlayer(ctx context.Context, cfg player.SearchPla
 	}
 
 	var err error
+	res := make([]*twmodel.FoundPlayer, 0)
 	count := 0
 	if query != nil {
 		base := repo.
diff --git a/playerhistory/repository/pg_repository.go b/playerhistory/repository/pg_repository.go
index 028c2e8..a9e7cdc 100644
--- a/playerhistory/repository/pg_repository.go
+++ b/playerhistory/repository/pg_repository.go
@@ -23,7 +23,7 @@ func NewPGRepository(db *pg.DB) playerhistory.Repository {
 func (repo *pgRepository) Fetch(ctx context.Context, cfg playerhistory.FetchConfig) ([]*twmodel.PlayerHistory, int, error) {
 	var err error
 	total := 0
-	var data []*twmodel.PlayerHistory
+	data := make([]*twmodel.PlayerHistory, 0)
 	query := repo.
 		WithParam("SERVER", pg.Safe(cfg.Server)).
 		Model(&data).
diff --git a/server/repository/pg_repository.go b/server/repository/pg_repository.go
index 9560b94..2e5e1a4 100644
--- a/server/repository/pg_repository.go
+++ b/server/repository/pg_repository.go
@@ -28,7 +28,7 @@ func NewPGRepository(db *pg.DB) (server.Repository, error) {
 func (repo *pgRepository) Fetch(ctx context.Context, cfg server.FetchConfig) ([]*twmodel.Server, int, error) {
 	var err error
 	total := 0
-	var data []*twmodel.Server
+	data := make([]*twmodel.Server, 0)
 	query := repo.
 		Model(&data).
 		Context(ctx).
diff --git a/serverstats/repository/pg_repository.go b/serverstats/repository/pg_repository.go
index 3c29af0..2ce9a7f 100644
--- a/serverstats/repository/pg_repository.go
+++ b/serverstats/repository/pg_repository.go
@@ -22,7 +22,7 @@ func NewPGRepository(db *pg.DB) serverstats.Repository {
 
 func (repo *pgRepository) Fetch(ctx context.Context, cfg serverstats.FetchConfig) ([]*twmodel.ServerStats, int, error) {
 	var err error
-	var data []*twmodel.ServerStats
+	data := make([]*twmodel.ServerStats, 0)
 	total := 0
 	query := repo.
 		WithParam("SERVER", pg.Safe(cfg.Server)).
diff --git a/tribe/repository/pg_repository.go b/tribe/repository/pg_repository.go
index 9dd35d9..5f8e8bf 100644
--- a/tribe/repository/pg_repository.go
+++ b/tribe/repository/pg_repository.go
@@ -23,7 +23,7 @@ func NewPGRepository(db *pg.DB) tribe.Repository {
 
 func (repo *pgRepository) Fetch(ctx context.Context, cfg tribe.FetchConfig) ([]*twmodel.Tribe, int, error) {
 	var err error
-	var data []*twmodel.Tribe
+	data := make([]*twmodel.Tribe, 0)
 	total := 0
 	query := repo.
 		WithParam("SERVER", pg.Safe(cfg.Server)).
@@ -66,7 +66,6 @@ func (repo *pgRepository) SearchTribe(ctx context.Context, cfg tribe.SearchTribe
 	}
 
 	var query *orm.Query
-	var res []*twmodel.FoundTribe
 	for _, server := range servers {
 		safeKey := pg.Safe(server.Key)
 		otherQuery := repo.
@@ -85,6 +84,7 @@ func (repo *pgRepository) SearchTribe(ctx context.Context, cfg tribe.SearchTribe
 
 	var err error
 	count := 0
+	res := make([]*twmodel.FoundTribe, 0)
 	if query != nil {
 		base := repo.
 			Model().
diff --git a/tribechange/repository/pg_repository.go b/tribechange/repository/pg_repository.go
index a973511..d245738 100644
--- a/tribechange/repository/pg_repository.go
+++ b/tribechange/repository/pg_repository.go
@@ -23,7 +23,7 @@ func NewPGRepository(db *pg.DB) tribechange.Repository {
 func (repo *pgRepository) Fetch(ctx context.Context, cfg tribechange.FetchConfig) ([]*twmodel.TribeChange, int, error) {
 	var err error
 	total := 0
-	var data []*twmodel.TribeChange
+	data := make([]*twmodel.TribeChange, 0)
 	query := repo.
 		WithParam("SERVER", pg.Safe(cfg.Server)).
 		Model(&data).
diff --git a/tribehistory/repository/pg_repository.go b/tribehistory/repository/pg_repository.go
index 7beb1d5..c25365a 100644
--- a/tribehistory/repository/pg_repository.go
+++ b/tribehistory/repository/pg_repository.go
@@ -23,7 +23,7 @@ func NewPGRepository(db *pg.DB) tribehistory.Repository {
 func (repo *pgRepository) Fetch(ctx context.Context, cfg tribehistory.FetchConfig) ([]*twmodel.TribeHistory, int, error) {
 	var err error
 	total := 0
-	var data []*twmodel.TribeHistory
+	data := make([]*twmodel.TribeHistory, 0)
 	query := repo.
 		WithParam("SERVER", pg.Safe(cfg.Server)).
 		Model(&data).
diff --git a/version/repository/pg_repository.go b/version/repository/pg_repository.go
index 6847a98..d87afa4 100644
--- a/version/repository/pg_repository.go
+++ b/version/repository/pg_repository.go
@@ -27,7 +27,7 @@ func NewPGRepository(db *pg.DB) (version.Repository, error) {
 
 func (repo *pgRepository) Fetch(ctx context.Context, cfg version.FetchConfig) ([]*twmodel.Version, int, error) {
 	var err error
-	var data []*twmodel.Version
+	data := make([]*twmodel.Version, 0)
 	total := 0
 	query := repo.
 		Model(&data).
diff --git a/village/repository/pg_repository.go b/village/repository/pg_repository.go
index 03c0cf9..18383ef 100644
--- a/village/repository/pg_repository.go
+++ b/village/repository/pg_repository.go
@@ -22,7 +22,7 @@ func NewPGRepository(db *pg.DB) village.Repository {
 
 func (repo *pgRepository) Fetch(ctx context.Context, cfg village.FetchConfig) ([]*twmodel.Village, int, error) {
 	var err error
-	var data []*twmodel.Village
+	data := make([]*twmodel.Village, 0)
 	query := repo.
 		WithParam("SERVER", pg.Safe(cfg.Server)).
 		Model(&data).