diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index c291c6565e..4594517869 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -5,10 +5,12 @@ on:
     branches:
       - master
       - develop
+      - bootstrap5
   pull_request:
     branches:
       - master
       - develop
+      - bootstrap5
 
 defaults:
   run:
diff --git a/public/src/modules/search.js b/public/src/modules/search.js
index 1a0d8e6b9e..20e3a02d33 100644
--- a/public/src/modules/search.js
+++ b/public/src/modules/search.js
@@ -87,13 +87,13 @@ define('search', ['translator', 'storage', 'hooks', 'alerts'], function (transla
 		const filterCategoryEl = quickSearchResults.find('.filter-category');
 
 		function updateCategoryFilterName() {
-			if (ajaxify.data.template.category) {
+			if (ajaxify.data.template.category && ajaxify.data.cid) {
 				translator.translate('[[search:search-in-category, ' + ajaxify.data.name + ']]', function (translated) {
 					const name = $('<div></div>').html(translated).text();
 					filterCategoryEl.find('.name').text(name);
 				});
 			}
-			filterCategoryEl.toggleClass('hidden', !ajaxify.data.template.category);
+			filterCategoryEl.toggleClass('hidden', !(ajaxify.data.template.category && ajaxify.data.cid));
 		}
 
 		function doSearch() {
@@ -101,7 +101,7 @@ define('search', ['translator', 'storage', 'hooks', 'alerts'], function (transla
 			options.searchOptions.term = inputEl.val();
 			updateCategoryFilterName();
 
-			if (ajaxify.data.template.category) {
+			if (ajaxify.data.template.category && ajaxify.data.cid) {
 				if (filterCategoryEl.find('input[type="checkbox"]').is(':checked')) {
 					options.searchOptions.categories = [ajaxify.data.cid];
 					options.searchOptions.searchChildren = true;
diff --git a/src/middleware/headers.js b/src/middleware/headers.js
index dacfb62dec..7f05f11928 100644
--- a/src/middleware/headers.js
+++ b/src/middleware/headers.js
@@ -86,15 +86,16 @@ module.exports = function (middleware) {
 			}
 			return next();
 		}
-		if (parseInt(req.uid, 10) > 0 || !meta.config.autoDetectLang) {
-			return next();
+
+		if (meta.config.autoDetectLang && req.uid === 0) {
+			const langs = await listCodes();
+			const lang = req.acceptsLanguages(langs);
+			if (!lang) {
+				return next();
+			}
+			req.query.lang = lang;
 		}
-		const langs = await listCodes();
-		const lang = req.acceptsLanguages(langs);
-		if (!lang) {
-			return next();
-		}
-		req.query.lang = lang;
+
 		next();
 	});
 
diff --git a/src/views/emails/partials/header.tpl b/src/views/emails/partials/header.tpl
index 0466c83cfe..e292b13830 100644
--- a/src/views/emails/partials/header.tpl
+++ b/src/views/emails/partials/header.tpl
@@ -141,6 +141,7 @@
 
         .notification-body img {
             max-width: 100%;
+            height: auto;
         }
 	</style>