diff --git a/graphql/resolvers/daily_player_stats.go b/graphql/resolvers/daily_player_stats.go
index 5ab6761..bcd93f8 100644
--- a/graphql/resolvers/daily_player_stats.go
+++ b/graphql/resolvers/daily_player_stats.go
@@ -22,24 +22,15 @@ func (r *queryResolver) DailyPlayerStats(ctx context.Context,
 	limit *int,
 	offset *int,
 	sort []string) (*generated.DailyPlayerStats, error) {
-	defLimit := 0
-	defOffset := 0
-	if limit == nil {
-		limit = &defLimit
-	}
-	if offset == nil {
-		offset = &defOffset
-	}
-
 	var err error
 	list := &generated.DailyPlayerStats{}
 	list.Items, list.Total, err = r.DailyPlayerStatsUcase.Fetch(ctx, dailyplayerstats.FetchConfig{
 		Server: server,
 		Filter: filter,
 		Sort:   sort,
-		Limit:  *limit,
-		Offset: *offset,
-		Count:  true,
+		Limit:  safeIntPointer(limit, 0),
+		Offset: safeIntPointer(offset, 0),
+		Count:  shouldCount(ctx),
 	})
 	return list, err
 }
diff --git a/graphql/resolvers/daily_tribe_stats.go b/graphql/resolvers/daily_tribe_stats.go
index cdc086d..8ca17a4 100644
--- a/graphql/resolvers/daily_tribe_stats.go
+++ b/graphql/resolvers/daily_tribe_stats.go
@@ -22,24 +22,15 @@ func (r *queryResolver) DailyTribeStats(ctx context.Context,
 	limit *int,
 	offset *int,
 	sort []string) (*generated.DailyTribeStats, error) {
-	defLimit := 0
-	defOffset := 0
-	if limit == nil {
-		limit = &defLimit
-	}
-	if offset == nil {
-		offset = &defOffset
-	}
-
 	var err error
 	list := &generated.DailyTribeStats{}
 	list.Items, list.Total, err = r.DailyTribeStatsUcase.Fetch(ctx, dailytribestats.FetchConfig{
 		Server: server,
 		Filter: filter,
 		Sort:   sort,
-		Limit:  *limit,
-		Offset: *offset,
-		Count:  true,
+		Limit:  safeIntPointer(limit, 0),
+		Offset: safeIntPointer(offset, 0),
+		Count:  shouldCount(ctx),
 	})
 	return list, err
 }
diff --git a/graphql/resolvers/ennoblement.go b/graphql/resolvers/ennoblement.go
index 5580499..b6aee62 100644
--- a/graphql/resolvers/ennoblement.go
+++ b/graphql/resolvers/ennoblement.go
@@ -53,24 +53,15 @@ func (r *queryResolver) Ennoblements(ctx context.Context, server string,
 	limit *int,
 	offset *int,
 	sort []string) (*generated.EnnoblementList, error) {
-	defLimit := 0
-	defOffset := 0
-	if limit == nil {
-		limit = &defLimit
-	}
-	if offset == nil {
-		offset = &defOffset
-	}
-
 	var err error
 	list := &generated.EnnoblementList{}
 	list.Items, list.Total, err = r.EnnoblementUcase.Fetch(ctx, ennoblement.FetchConfig{
 		Server: server,
 		Filter: f,
 		Sort:   sort,
-		Limit:  *limit,
-		Offset: *offset,
-		Count:  true,
+		Limit:  safeIntPointer(limit, 0),
+		Offset: safeIntPointer(offset, 0),
+		Count:  shouldCount(ctx),
 	})
 	return list, err
 }
diff --git a/graphql/resolvers/helpers.go b/graphql/resolvers/helpers.go
index 74ab39f..5bd9086 100644
--- a/graphql/resolvers/helpers.go
+++ b/graphql/resolvers/helpers.go
@@ -68,14 +68,12 @@ func getTribe(ctx context.Context, id int) *models.Tribe {
 }
 
 func shouldCount(ctx context.Context) bool {
-	count := false
 	for _, field := range graphql.CollectFieldsCtx(ctx, nil) {
 		if field.Name == countField {
-			count = true
-			break
+			return true
 		}
 	}
-	return count
+	return false
 }
 
 func safeStrPointer(s *string, def string) string {
diff --git a/graphql/resolvers/player.go b/graphql/resolvers/player.go
index 579cd0d..3265a23 100644
--- a/graphql/resolvers/player.go
+++ b/graphql/resolvers/player.go
@@ -52,24 +52,15 @@ func (r *queryResolver) Players(ctx context.Context,
 	limit *int,
 	offset *int,
 	sort []string) (*generated.PlayerList, error) {
-	defLimit := 0
-	defOffset := 0
-	if limit == nil {
-		limit = &defLimit
-	}
-	if offset == nil {
-		offset = &defOffset
-	}
-
 	var err error
 	list := &generated.PlayerList{}
 	list.Items, list.Total, err = r.PlayerUcase.Fetch(ctx, player.FetchConfig{
 		Server: server,
 		Filter: f,
 		Sort:   sort,
-		Limit:  *limit,
-		Offset: *offset,
-		Count:  true,
+		Limit:  safeIntPointer(limit, 0),
+		Offset: safeIntPointer(offset, 0),
+		Count:  shouldCount(ctx),
 	})
 	return list, err
 }
diff --git a/graphql/resolvers/player_history.go b/graphql/resolvers/player_history.go
index 8244bb2..06c2117 100644
--- a/graphql/resolvers/player_history.go
+++ b/graphql/resolvers/player_history.go
@@ -30,24 +30,15 @@ func (r *Resolver) PlayerHistory(ctx context.Context,
 	limit *int,
 	offset *int,
 	sort []string) (*generated.PlayerHistory, error) {
-	defLimit := 0
-	defOffset := 0
-	if limit == nil {
-		limit = &defLimit
-	}
-	if offset == nil {
-		offset = &defOffset
-	}
-
 	var err error
 	list := &generated.PlayerHistory{}
 	list.Items, list.Total, err = r.PlayerHistoryUcase.Fetch(ctx, playerhistory.FetchConfig{
 		Server: server,
 		Filter: f,
 		Sort:   sort,
-		Limit:  *limit,
-		Offset: *offset,
-		Count:  true,
+		Limit:  safeIntPointer(limit, 0),
+		Offset: safeIntPointer(offset, 0),
+		Count:  shouldCount(ctx),
 	})
 	return list, err
 }
diff --git a/graphql/resolvers/server.go b/graphql/resolvers/server.go
index 8627a9c..0ee082c 100644
--- a/graphql/resolvers/server.go
+++ b/graphql/resolvers/server.go
@@ -28,23 +28,14 @@ func (r *queryResolver) Servers(ctx context.Context,
 	limit *int,
 	offset *int,
 	sort []string) (*generated.ServerList, error) {
-	defLimit := 0
-	defOffset := 0
-	if limit == nil {
-		limit = &defLimit
-	}
-	if offset == nil {
-		offset = &defOffset
-	}
-
 	var err error
 	list := &generated.ServerList{}
 	list.Items, list.Total, err = r.ServerUcase.Fetch(ctx, server.FetchConfig{
 		Filter: f,
 		Sort:   sort,
-		Limit:  *limit,
-		Offset: *offset,
-		Count:  true,
+		Limit:  safeIntPointer(limit, 0),
+		Offset: safeIntPointer(offset, 0),
+		Count:  shouldCount(ctx),
 	})
 	return list, err
 }
diff --git a/graphql/resolvers/server_stats.go b/graphql/resolvers/server_stats.go
index 34462a5..d849d6e 100644
--- a/graphql/resolvers/server_stats.go
+++ b/graphql/resolvers/server_stats.go
@@ -14,24 +14,15 @@ func (r *Resolver) ServerStats(ctx context.Context,
 	limit *int,
 	offset *int,
 	sort []string) (*generated.ServerStats, error) {
-	defLimit := 0
-	defOffset := 0
-	if limit == nil {
-		limit = &defLimit
-	}
-	if offset == nil {
-		offset = &defOffset
-	}
-
 	var err error
 	list := &generated.ServerStats{}
 	list.Items, list.Total, err = r.ServerStatsUcase.Fetch(ctx, serverstats.FetchConfig{
 		Server: server,
 		Filter: f,
 		Sort:   sort,
-		Limit:  *limit,
-		Offset: *offset,
-		Count:  true,
+		Limit:  safeIntPointer(limit, 0),
+		Offset: safeIntPointer(offset, 0),
+		Count:  shouldCount(ctx),
 	})
 	return list, err
 }
diff --git a/graphql/resolvers/tribe.go b/graphql/resolvers/tribe.go
index 0431779..1282302 100644
--- a/graphql/resolvers/tribe.go
+++ b/graphql/resolvers/tribe.go
@@ -14,24 +14,15 @@ func (r *queryResolver) Tribes(ctx context.Context,
 	limit *int,
 	offset *int,
 	sort []string) (*generated.TribeList, error) {
-	defLimit := 0
-	defOffset := 0
-	if limit == nil {
-		limit = &defLimit
-	}
-	if offset == nil {
-		offset = &defOffset
-	}
-
 	var err error
 	list := &generated.TribeList{}
 	list.Items, list.Total, err = r.TribeUcase.Fetch(ctx, tribe.FetchConfig{
 		Server: server,
 		Filter: f,
 		Sort:   sort,
-		Limit:  *limit,
-		Offset: *offset,
-		Count:  true,
+		Limit:  safeIntPointer(limit, 0),
+		Offset: safeIntPointer(offset, 0),
+		Count:  shouldCount(ctx),
 	})
 	return list, err
 }
diff --git a/graphql/resolvers/tribe_change.go b/graphql/resolvers/tribe_change.go
index b5a1bc1..0956daa 100644
--- a/graphql/resolvers/tribe_change.go
+++ b/graphql/resolvers/tribe_change.go
@@ -38,23 +38,14 @@ func (r *Resolver) TribeChanges(ctx context.Context,
 	limit *int,
 	offset *int,
 	sort []string) (*generated.TribeChanges, error) {
-	defLimit := 0
-	defOffset := 0
-	if limit == nil {
-		limit = &defLimit
-	}
-	if offset == nil {
-		offset = &defOffset
-	}
-
 	var err error
 	list := &generated.TribeChanges{}
 	list.Items, list.Total, err = r.TribeChangeUcase.Fetch(ctx, tribechange.FetchConfig{
 		Filter: f,
 		Sort:   sort,
-		Limit:  *limit,
-		Offset: *offset,
-		Count:  true,
+		Limit:  safeIntPointer(limit, 0),
+		Offset: safeIntPointer(offset, 0),
+		Count:  shouldCount(ctx),
 		Server: server,
 	})
 	return list, err
diff --git a/graphql/resolvers/tribe_history.go b/graphql/resolvers/tribe_history.go
index e3bc53b..c7c5458 100644
--- a/graphql/resolvers/tribe_history.go
+++ b/graphql/resolvers/tribe_history.go
@@ -22,23 +22,14 @@ func (r *Resolver) TribeHistory(ctx context.Context,
 	limit *int,
 	offset *int,
 	sort []string) (*generated.TribeHistory, error) {
-	defLimit := 0
-	defOffset := 0
-	if limit == nil {
-		limit = &defLimit
-	}
-	if offset == nil {
-		offset = &defOffset
-	}
-
 	var err error
 	list := &generated.TribeHistory{}
 	list.Items, list.Total, err = r.TribeHistoryUcase.Fetch(ctx, tribehistory.FetchConfig{
 		Filter: f,
 		Sort:   sort,
-		Limit:  *limit,
-		Offset: *offset,
-		Count:  true,
+		Limit:  safeIntPointer(limit, 0),
+		Offset: safeIntPointer(offset, 0),
+		Count:  shouldCount(ctx),
 		Server: server,
 	})
 	return list, err
diff --git a/graphql/resolvers/version.go b/graphql/resolvers/version.go
index 0f6dd2a..0e4e684 100644
--- a/graphql/resolvers/version.go
+++ b/graphql/resolvers/version.go
@@ -17,23 +17,14 @@ func (r *queryResolver) Versions(ctx context.Context,
 	limit *int,
 	offset *int,
 	sort []string) (*generated.VersionList, error) {
-	defLimit := 0
-	defOffset := 0
-	if limit == nil {
-		limit = &defLimit
-	}
-	if offset == nil {
-		offset = &defOffset
-	}
-
 	var err error
 	list := &generated.VersionList{}
 	list.Items, list.Total, err = r.VersionUcase.Fetch(ctx, version.FetchConfig{
 		Filter: f,
 		Sort:   sort,
-		Limit:  *limit,
-		Offset: *offset,
-		Count:  true,
+		Limit:  safeIntPointer(limit, 0),
+		Offset: safeIntPointer(offset, 0),
+		Count:  shouldCount(ctx),
 	})
 	return list, err
 }
diff --git a/graphql/resolvers/village.go b/graphql/resolvers/village.go
index a8a1eb8..3c2825c 100644
--- a/graphql/resolvers/village.go
+++ b/graphql/resolvers/village.go
@@ -22,23 +22,14 @@ func (r *queryResolver) Villages(ctx context.Context,
 	limit *int,
 	offset *int,
 	sort []string) (*generated.VillageList, error) {
-	defLimit := 0
-	defOffset := 0
-	if limit == nil {
-		limit = &defLimit
-	}
-	if offset == nil {
-		offset = &defOffset
-	}
-
 	var err error
 	list := &generated.VillageList{}
 	list.Items, list.Total, err = r.VillageUcase.Fetch(ctx, village.FetchConfig{
 		Filter: f,
 		Sort:   sort,
-		Limit:  *limit,
-		Offset: *offset,
-		Count:  true,
+		Limit:  safeIntPointer(limit, 0),
+		Offset: safeIntPointer(offset, 0),
+		Count:  shouldCount(ctx),
 		Server: server,
 	})
 	return list, err