diff --git a/.github/ISSUE_TEMPLATE/sql_api_query_issue.md b/.github/ISSUE_TEMPLATE/sql_api_query_issue.md
index 38d314e85bc1e..d253a6cfa8e17 100644
--- a/.github/ISSUE_TEMPLATE/sql_api_query_issue.md
+++ b/.github/ISSUE_TEMPLATE/sql_api_query_issue.md
@@ -2,7 +2,7 @@
 name: SQL API Query Issue
 about: Create a report to help us improve
 title: ''
-labels: ''
+labels: 'api:sql'
 assignees: ''
 
 ---
@@ -13,8 +13,11 @@ Search for `Failed SQL` log message.
 **Logical Plan**
 Search for `Can't rewrite plan` log message.
 
+**Tool**
+Was thethe SQL query above generated by some BI tool or any other tool? Did you write it yourself?
+
 **Version:**
-[e.g. 0.4.5]
+E.g., v1.1.0.
 
 **Additional context**
 Add any other context about the problem here.