diff --git a/cmd/eventstore/delete.go b/cmd/eventstore/delete.go
index 440325f..f02c5a2 100644
--- a/cmd/eventstore/delete.go
+++ b/cmd/eventstore/delete.go
@@ -11,8 +11,8 @@ import (
 
 var delete_ = &cli.Command{
 	Name:        "delete",
-	Usage:       "deletes an event and all its associated index entries",
-	Description: ``,
+	Usage:       "deletes an event by id and all its associated index entries",
+	Description: "",
 	Action: func(ctx context.Context, c *cli.Command) error {
 		hasError := false
 		for line := range getStdinLinesOrFirstArgument(c) {
diff --git a/cmd/eventstore/main.go b/cmd/eventstore/main.go
index b2dbf44..be7d963 100644
--- a/cmd/eventstore/main.go
+++ b/cmd/eventstore/main.go
@@ -67,15 +67,36 @@ var app = &cli.Command{
 
 		switch typ {
 		case "sqlite":
-			db = &sqlite3.SQLite3Backend{DatabaseURL: path}
+			db = &sqlite3.SQLite3Backend{
+				DatabaseURL:       path,
+				QueryLimit:        1_000_000,
+				QueryAuthorsLimit: 1_000_000,
+				QueryKindsLimit:   1_000_000,
+				QueryIDsLimit:     1_000_000,
+				QueryTagsLimit:    1_000_000,
+			}
 		case "lmdb":
-			db = &lmdb.LMDBBackend{Path: path, MaxLimit: 5000}
+			db = &lmdb.LMDBBackend{Path: path, MaxLimit: 1_000_000}
 		case "badger":
-			db = &badger.BadgerBackend{Path: path, MaxLimit: 5000}
+			db = &badger.BadgerBackend{Path: path, MaxLimit: 1_000_000}
 		case "postgres", "postgresql":
-			db = &postgresql.PostgresBackend{DatabaseURL: path}
+			db = &postgresql.PostgresBackend{
+				DatabaseURL:       path,
+				QueryLimit:        1_000_000,
+				QueryAuthorsLimit: 1_000_000,
+				QueryKindsLimit:   1_000_000,
+				QueryIDsLimit:     1_000_000,
+				QueryTagsLimit:    1_000_000,
+			}
 		case "mysql":
-			db = &mysql.MySQLBackend{DatabaseURL: path}
+			db = &mysql.MySQLBackend{
+				DatabaseURL:       path,
+				QueryLimit:        1_000_000,
+				QueryAuthorsLimit: 1_000_000,
+				QueryKindsLimit:   1_000_000,
+				QueryIDsLimit:     1_000_000,
+				QueryTagsLimit:    1_000_000,
+			}
 		case "elasticsearch":
 			db = &elasticsearch.ElasticsearchStorage{URL: path}
 		case "":
diff --git a/cmd/eventstore/query.go b/cmd/eventstore/query.go
index b33e068..7c19558 100644
--- a/cmd/eventstore/query.go
+++ b/cmd/eventstore/query.go
@@ -13,7 +13,7 @@ import (
 var query = &cli.Command{
 	Name:        "query",
 	Usage:       "queries an eventstore for events, takes a Nostr filter as argument",
-	Description: ``,
+	Description: "unless specified to be smaller, up to a million results will be returned",
 	Action: func(ctx context.Context, c *cli.Command) error {
 		hasError := false
 		for line := range getStdinLinesOrFirstArgument(c) {