diff --git a/functions/__based_init_db.fish b/functions/__based_init_db.fish
index 73614e1..b342888 100644
--- a/functions/__based_init_db.fish
+++ b/functions/__based_init_db.fish
@@ -4,14 +4,21 @@ function __based_init_db
         echo "Database already exists at $db_path. If you want to reinitialize, please delete it first."
         return
     end
+
     mkdir -p (dirname $db_path)
-    sqlite3 $db_path "CREATE TABLE IF NOT EXISTS log (
-        path TEXT NOT NULL,
-        cmd TEXT NOT NULL,
-        counter INTEGER NOT NULL DEFAULT 1,
-        ts INTEGER NOT NULL,
-        PRIMARY KEY (path, cmd)
-    );"
+
+    sqlite3 -batch $db_path "
+        CREATE TABLE IF NOT EXISTS log (
+            path TEXT NOT NULL,
+            cmd TEXT NOT NULL,
+            counter INTEGER NOT NULL DEFAULT 1,
+            ts INTEGER NOT NULL,
+            PRIMARY KEY (path, cmd)
+        );
+        CREATE INDEX IF NOT EXISTS idx_log_cmd ON log(cmd);
+        CREATE INDEX IF NOT EXISTS idx_log_path_ts ON log(path, ts);
+        CREATE INDEX IF NOT EXISTS idx_log_path_cmd ON log(path, cmd);
+    "
 
     echo "Based initialized. You can also import your fish history with 'based import'."
 end