diff --git a/packages/ui/certd-server/db/migration/v10016__index.sql b/packages/ui/certd-server/db/migration/v10016__index.sql
new file mode 100644
index 000000000..3a547fb4e
--- /dev/null
+++ b/packages/ui/certd-server/db/migration/v10016__index.sql
@@ -0,0 +1,31 @@
+
+CREATE INDEX "index_access_user_id" ON "cd_access" ("user_id");
+
+CREATE INDEX "index_cname_record_user_id" ON "cd_cname_record" ("user_id");
+
+
+CREATE INDEX "index_history_user_id" ON "pi_history" ("user_id");
+
+CREATE INDEX "index_history_log_user_id" ON "pi_history_log" ("user_id");
+
+CREATE INDEX "index_history_log_pipeline_id" ON "pi_history_log" ("pipeline_id");
+
+CREATE INDEX "index_notification_user_id" ON "pi_notification" ("user_id");
+
+CREATE INDEX "index_pipeline_user_id" ON "pi_pipeline" ("user_id");
+CREATE INDEX "index_pipeline_group_user_id" ON "pi_pipeline_group" ("user_id");
+
+
+
+CREATE INDEX "index_storage_default_get" ON "pi_storage" ("scope", "namespace", "key");
+CREATE INDEX "index_storage_user_id" ON "pi_storage" ("user_id");
+
+
+CREATE INDEX "index_user_email" ON "sys_user" ("email");
+CREATE INDEX "index_user_mobile" ON "sys_user" ("mobile");
+
+CREATE INDEX "index_permission" ON "sys_permission" ("permission");
+
+
+CREATE INDEX "index_user_settings_user_id" ON "user_settings" ("user_id");
+
diff --git a/packages/ui/certd-server/db/v10016__index.sql b/packages/ui/certd-server/db/v10016__index.sql
deleted file mode 100644
index 3d7948123..000000000
--- a/packages/ui/certd-server/db/v10016__index.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE INDEX "index_user_id" ON "pi_pipeline" ("user_id");
diff --git a/packages/ui/certd-server/src/controller/pipeline/history-controller.ts b/packages/ui/certd-server/src/controller/pipeline/history-controller.ts
index 85ec17822..c2393a8e3 100644
--- a/packages/ui/certd-server/src/controller/pipeline/history-controller.ts
+++ b/packages/ui/certd-server/src/controller/pipeline/history-controller.ts
@@ -78,10 +78,9 @@ export class HistoryController extends CrudController<HistoryService> {
 
   @Post('/list', { summary: Constants.per.authOnly })
   async list(@Body(ALL) body) {
-    body.query = body.query ?? {};
     const isAdmin = await this.authService.isAdmin(this.ctx);
     if (!isAdmin) {
-      body.query.userId = this.getUserId();
+      body.userId = this.getUserId();
     }
     if (body.pipelineId == null) {
       return this.ok([]);