diff --git a/api/db.js b/api/db.js
index ae7535f..5710ff3 100644
--- a/api/db.js
+++ b/api/db.js
@@ -358,7 +358,7 @@ export async function get_character_batch_for_stats(batch, sort, order) {
 
 	try {
 		const char_count = await get_row_count(CHARACTER.THIS);
-		const chars = await pool.query(`SELECT id, name, faction_id, bep, cep FROM avatar ORDER BY ${to_sql(sort)} ${to_sql(order)} OFFSET $1*1000 LIMIT 1000`, values);
+		const chars = await pool.query(`SELECT id, name, faction_id, bep, cep FROM avatar ORDER BY ${to_sql(sort)} ${to_sql(order)} OFFSET $1*500 LIMIT 500`, values);
 
 		return chars.rows;
 	} catch (e) {
@@ -405,7 +405,8 @@ export async function get_top_kills() {
          ' INNER JOIN avatar ON killactivity.killer_id = avatar.id' +
          ' WHERE exp > 0' +
          ' GROUP BY killactivity.killer_id, avatar.name, avatar.bep, avatar.cep, avatar.faction_id, avatar.gender_id, avatar.head_id' +
-         ' ORDER BY count(killer_id) DESC')
+         ' ORDER BY count(killer_id) DESC' +
+         ' LIMIT 500')
 		return kills.rows;
 	} catch (e) {
 		if (e.code)
diff --git a/app/views/Leaderboard.svelte b/app/views/Leaderboard.svelte
index 0acd0b0..f47f4fb 100644
--- a/app/views/Leaderboard.svelte
+++ b/app/views/Leaderboard.svelte
@@ -23,7 +23,7 @@
     try {
       const resp = await axios.get("/api/char_stats_bep/0");
       const stats = resp.data;
-      bepPlayers = stats.players.filter(p => p.bep > 14999);
+      bepPlayers = stats.players;
       // Reset alert message if needed
       alert.message("");
     } catch (e) {