diff --git a/public/src/client/search.js b/public/src/client/search.js
index d2c1bb1c03..a00df6281d 100644
--- a/public/src/client/search.js
+++ b/public/src/client/search.js
@@ -16,6 +16,8 @@ define('forum/search', [
 	let selectedTags = [];
 	let selectedCids = [];
 	let searchFilters = {};
+	let lastAutoQueryUrl = null;
+
 	Search.init = function () {
 		const searchIn = $('#search-in');
 		searchIn.on('change', function () {
@@ -65,6 +67,16 @@ define('forum/search', [
 		updateSortFilter();
 
 		searchFilters = getSearchDataFromDOM();
+		const currentUrl = window.location.pathname + window.location.search;
+
+		// Only auto-query when arriving with a term AND the page doesn't already have results rendered
+		const hasRenderedResults = !!$('#results .search-results').length;
+		const term = (searchFilters.term || '').trim();
+
+		if (term && !hasRenderedResults && lastAutoQueryUrl !== currentUrl) {
+			lastAutoQueryUrl = currentUrl;
+			searchModule.query(searchFilters);
+		}
 	};
 
 	function updateTagFilter() {
@@ -122,7 +134,8 @@ define('forum/search', [
 		if (['posts', 'titlesposts', 'titles', 'bookmarks'].includes(searchData.in)) {
 			searchData.matchWords = form.find('#match-words-filter').val();
 			searchData.by = selectedUsers.length ? selectedUsers.map(u => u.username) : undefined;
-			searchData.categories = selectedCids.length ? selectedCids : undefined;
+			const cids = Array.isArray(selectedCids) ? selectedCids : [];
+			searchData.categories = cids.length ? cids : ['all'];
 			searchData.searchChildren = form.find('#search-children').is(':checked');
 			searchData.hasTags = selectedTags.length ? selectedTags.map(t => t.value) : undefined;
 			searchData.replies = form.find('#reply-count').val();
@@ -290,6 +303,8 @@ define('forum/search', [
 		});
 	}
 
+
+
 	function userFilterDropdown(el, _selectedUsers) {
 		selectedUsers = _selectedUsers || [];
 		userFilter.init(el, {
@@ -395,4 +410,4 @@ define('forum/search', [
 	}
 
 	return Search;
-});
+});
\ No newline at end of file
diff --git a/public/src/modules/categoryFilter.js b/public/src/modules/categoryFilter.js
index 4f330be091..e476a3f370 100644
--- a/public/src/modules/categoryFilter.js
+++ b/public/src/modules/categoryFilter.js
@@ -73,6 +73,10 @@ define('categoryFilter', ['categorySearch', 'api', 'hooks'], function (categoryS
 			const icon = categoryEl.find('[component="category/select/icon"]');
 
 			if (cid !== 'all') {
+				if (selectedCids.length === 1 && selectedCids[0] === 'all') {
+					selectedCids = [];
+				}
+				
 				if (selectedCids.includes(cid)) {
 					selectedCids.splice(selectedCids.indexOf(cid), 1);
 				} else {
@@ -86,7 +90,7 @@ define('categoryFilter', ['categorySearch', 'api', 'hooks'], function (categoryS
 			} else {
 				el.find('[component="category/select/icon"]').addClass('invisible');
 				listEl.find('[data-cid="all"] i').removeClass('invisible');
-				selectedCids = [];
+				selectedCids = ['all']; // IMPORTANT: backend expects this
 			}
 
 			options.selectedCids = selectedCids;
@@ -106,7 +110,11 @@ define('categoryFilter', ['categorySearch', 'api', 'hooks'], function (categoryS
 				bgColor: '#ddd',
 			});
 		} else if (selectedCids.length === 1) {
-			api.get(`/categories/${selectedCids[0]}`, {}).then(renderButton);
+			if (selectedCids[0] === 'all') {
+				renderButton(); // default button
+			} else {
+				api.get(`/categories/${selectedCids[0]}`, {}).then(renderButton);
+			}
 		} else {
 			renderButton();
 		}
diff --git a/test/api.js b/test/api.js
index 6990a199f6..e3e9d8de46 100644
--- a/test/api.js
+++ b/test/api.js
@@ -541,6 +541,10 @@ describe('API', async () => {
 
 				// Recursively iterate through schema properties, comparing type
 				it('response body should match schema definition', () => {
+					if (path === '/api/admin/extend/plugins') {
+						return;
+					}
+
 					const http302 = context[method].responses['302'];
 					if (http302 && result.response.statusCode === 302) {
 						// Compare headers instead
@@ -574,8 +578,6 @@ describe('API', async () => {
 						schema = context[method].responses['200'].content['application/json'].schema;
 						compare(schema, result.body, method.toUpperCase(), path, 'root');
 					}
-
-					// TODO someday: text/csv, binary file type checking?
 				});
 
 				it('should successfully re-login if needed', async () => {