diff --git a/models/dbsql/dataset_foreigntable_for_es.sql b/models/dbsql/dataset_foreigntable_for_es.sql
index 13bb88e2f..5bb71348a 100644
--- a/models/dbsql/dataset_foreigntable_for_es.sql
+++ b/models/dbsql/dataset_foreigntable_for_es.sql
@@ -20,7 +20,7 @@ OPTIONS
     (
         host '192.168.207.94',
         port '9200',
-        index 'user_es-index',
+        index 'dataset-es-index',
         rowid_column 'id',
         default_sort '_id'
     )
diff --git a/models/dbsql/issue_foreigntable_for_es.sql b/models/dbsql/issue_foreigntable_for_es.sql
index d05dae93a..14d08171c 100644
--- a/models/dbsql/issue_foreigntable_for_es.sql
+++ b/models/dbsql/issue_foreigntable_for_es.sql
@@ -29,7 +29,7 @@ OPTIONS
     (
         host '192.168.207.94',
         port '9200',
-        index 'user_es-index',
+        index 'issue-es-index',
         rowid_column 'id',
         default_sort '_id'
     )
diff --git a/models/dbsql/pr_foreigntable_for_es.sql b/models/dbsql/pr_foreigntable_for_es.sql
index 1ebf4093b..96c47de79 100644
--- a/models/dbsql/pr_foreigntable_for_es.sql
+++ b/models/dbsql/pr_foreigntable_for_es.sql
@@ -25,7 +25,7 @@ OPTIONS
     (
         host '192.168.207.94',
         port '9200',
-        index 'user_es-index',
+        index 'pr-es-index',
         rowid_column 'id',
         default_sort '_id'
     )
diff --git a/models/dbsql/user_foreigntable_for_es.sql b/models/dbsql/user_foreigntable_for_es.sql
index 5708a5b4c..cc9e56db6 100644
--- a/models/dbsql/user_foreigntable_for_es.sql
+++ b/models/dbsql/user_foreigntable_for_es.sql
@@ -55,7 +55,7 @@ OPTIONS
     (
         host '192.168.207.94',
         port '9200',
-        index 'user_es-index',
+        index 'user-es-index',
         rowid_column 'id',
         default_sort '_id'
     )
diff --git a/routers/search.go b/routers/search.go
index 5e1e0a76f..c307c668a 100644
--- a/routers/search.go
+++ b/routers/search.go
@@ -25,7 +25,7 @@ var host = "http://192.168.207.94:9200"
 
 func Search(ctx *context.Context) {
 	TableName := ctx.Query("TableName")
-	//Key := ctx.Query("Key")
+	Key := ctx.Query("Key")
 	//SortBy := ctx.Query("SortBy")
 	//Page := ctx.QueryInt64("Page")
 	//PageSize := ctx.QueryInt64("PageSize")
@@ -39,6 +39,14 @@ func Search(ctx *context.Context) {
 		panic(err)
 	}
 
-	res, err := client.Search(TableName + "-es-index").Do(ctx.Req.Context())
+	boolQ := elastic.NewBoolQuery()
+
+	nameQuery := elastic.NewTermQuery("name", Key)
+	descriptionQuery := elastic.NewTermQuery("description", Key)
+
+	boolQ.Filter(nameQuery)
+	boolQ.Filter(descriptionQuery)
+
+	res, err := client.Search(TableName + "-es-index").Query(boolQ).Do(ctx.Req.Context())
 	ctx.JSON(200, res)
 }