diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index d842de89..bcae9612 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,6 +1,6 @@
 name: 🐛 Bug Report
 description: Something isn't working as expected? Report your bugs here.
-labels: [bug]
+labels: ['bug', 'needs triage']
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index c838f8d1..f2da7d4a 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -1,6 +1,5 @@
 name: 🚀 Feature request
 description: Suggest an improvement.
-title: Suggest an improvement
 labels: [proposal]
 assignees: []
 body:
diff --git a/modules/wowchemy/layouts/404.html b/modules/wowchemy/layouts/404.html
index 4bb9e4d5..d686a5b0 100644
--- a/modules/wowchemy/layouts/404.html
+++ b/modules/wowchemy/layouts/404.html
@@ -9,6 +9,8 @@
   <form class="d-flex align-items-center mb-3">
     <input name="q" type="search" class="form-control" placeholder="{{ i18n "search_placeholder" }}" autocomplete="off">
   </form>
+  {{ else if eq (lower site.Params.features.search.provider) "docsearch" }}
+  <div id="docsearch" style="margin-left: -16px" class="mb-2"></div>
   {{ end }}
 
   {{/* Suggest recently published pages to the user. */}}