diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
index b2b2d425897..0533495e2e1 100644
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -9,6 +9,7 @@ Please answer the following questions for yourself before submitting an issue. *
 
 - [ ] I checked the documentation and found no answer
 - [ ] I checked to make sure that this issue has not already been filed
+- [ ] This is not a ad/bug report
 
 ### Problem Description
 
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index c455592a73f..1cf9b7119a0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -111,6 +111,7 @@ body:
         - ---AdGuard filters---
         - AdGuard Base filter
         - AdGuard Mobile Ads filter
+        - AdGuard Chinese filter
         - AdGuard Dutch filter
         - AdGuard French filter
         - AdGuard German filter
@@ -165,7 +166,6 @@ body:
         - Polish Social Filters
         - Adblock-Persian list
         - Fanboy's Swedish
-        - AdGuard Chinese filter
         - Fanboy's Anti-Facebook List
         - Fanboy's Vietnamese
         - List-KR
@@ -228,15 +228,15 @@ body:
         Warning: Please remove private info before upload screenshots!
       value: |
           1. <comment>
+
           2. Screenshots
-          <details>
+          <details><summary>Screenshot 1:</summary>
 
           <!-- paste screenshot here -->
 
           </details>
 
-
-          <details>
+          <details><summary>Screenshot N:</summary>
 
           <!-- paste screenshot here -->
 
diff --git a/.github/ISSUE_TEMPLATE/bug_report_NSFW.yml b/.github/ISSUE_TEMPLATE/bug_report_NSFW.yml
index 9daf347904f..391b8f11d26 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_NSFW.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report_NSFW.yml
@@ -41,7 +41,7 @@ body:
     attributes:
       label: AdGuard version
       description: What version of our software are you running?
-      placeholder: ex. 7.7
+      placeholder: for example, 7.7.2, 2.6.1.1060 nightly, 3.6.14 beta
     validations:
       required: true
 
@@ -109,6 +109,7 @@ body:
         - ---AdGuard filters---
         - AdGuard Base filter
         - AdGuard Mobile Ads filter
+        - AdGuard Chinese filter
         - AdGuard Dutch filter
         - AdGuard French filter
         - AdGuard German filter
@@ -163,7 +164,6 @@ body:
         - Polish Social Filters
         - Adblock-Persian list
         - Fanboy's Swedish
-        - AdGuard Chinese filter
         - Fanboy's Anti-Facebook List
         - Fanboy's Vietnamese
         - List-KR
@@ -227,15 +227,15 @@ body:
         Warning: Please remove private info before upload screenshots!
       value: |
           1. <comment>
+
           2. Screenshots
-          <details>
+          <details><summary>Screenshot 1:</summary>
 
           <!-- paste screenshot here -->
 
           </details>
 
-
-          <details>
+          <details><summary>Screenshot N:</summary>
 
           <!-- paste screenshot here -->