diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index add32a5531..44d4231016 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1800,6 +1800,9 @@ _achievements:
     _setNameToNoriDev:
       title: "神様コンプレックス（CherryPick）"
       description: "名前を noridev に設定した"
+    _setNameToYojo:
+      title: "ロリータコンプレックス"
+      description: "名前を 幼女 に設定した"
     _passedSinceAccountCreated1:
       title: "一周年"
       description: "アカウント作成から1年経過した"
diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts
index 7db0614803..79e1d06d93 100644
--- a/packages/backend/src/core/SearchService.ts
+++ b/packages/backend/src/core/SearchService.ts
@@ -243,6 +243,13 @@ export class SearchService {
 				}
 			}
 
+			if (opts.fileOption) {
+				if (opts.fileOption === 'file-only') {
+					query.andWhere('note.fileIds != \'{}\'');
+				} else if (opts.fileOption === 'no-file') {
+					query.andWhere('note.fileIds = :fIds', { fIds: '{}' });
+				}
+			}
 			this.queryService.generateVisibilityQuery(query, me);
 			if (me) this.queryService.generateMutedUserQuery(query, me);
 			if (me) this.queryService.generateBlockedUserQuery(query, me);
diff --git a/packages/frontend/src/const.ts b/packages/frontend/src/const.ts
index b8b5502aa0..d71e9cf6e5 100644
--- a/packages/frontend/src/const.ts
+++ b/packages/frontend/src/const.ts
@@ -84,6 +84,7 @@ export const ROLE_POLICIES = [
 	'canManageCustomEmojis',
 	'canManageAvatarDecorations',
 	'canSearchNotes',
+	'canAdvancedSearchNotes',
 	'canUseTranslator',
 	'canHideAds',
 	'driveCapacityMb',
diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue
index f393cbb389..c0f2a736ef 100644
--- a/packages/frontend/src/pages/admin/roles.vue
+++ b/packages/frontend/src/pages/admin/roles.vue
@@ -111,7 +111,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 							</MkSwitch>
 						</MkFolder>
 
-						<MkFolder v-if="matchQuery([i18n.ts._role._options.canUseTranslator, 'canSearchNotes'])">
+						<MkFolder v-if="matchQuery([i18n.ts._role._options.canAdvancedSearchNotes, 'canAdvancedSearchNotes'])">
+							<template #label>{{ i18n.ts._role._options.canAdvancedSearchNotes }}</template>
+							<template #suffix>{{ policies.canAdvancedSearchNotes ? i18n.ts.yes : i18n.ts.no }}</template>
+							<MkSwitch v-model="policies.canAdvancedSearchNotes">
+								<template #label>{{ i18n.ts.enable }}</template>
+							</MkSwitch>
+						</MkFolder>
+
+						<MkFolder v-if="matchQuery([i18n.ts._role._options.canUseTranslator, 'canUseTranslator'])">
 							<template #label>{{ i18n.ts._role._options.canUseTranslator }}</template>
 							<template #suffix>{{ policies.canUseTranslator ? i18n.ts.yes : i18n.ts.no }}</template>
 							<MkSwitch v-model="policies.canUseTranslator">
diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index bd46fc868b..48bc6681c9 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -47,22 +47,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</MkFolder>
 			</div>
-			<div class="_gaps_m">
-				<MkFolder :defaultOpen="true">
-					<template #label>{{ i18n.ts.fileAttachedOnly }}</template>
-					<template v-if="isfileOnly" #suffix></template>
-
-					<div style="text-align: center;" class="_gaps">
-						<div>
-							<MkRadios v-model="isfileOnly" @update:modelValue="search()">
-								<option value="combined">{{ i18n.ts._advancedSearch._fileOption.combined }}</option>
-								<option value="file-only">{{ i18n.ts._advancedSearch._fileOption.fileAttachedOnly }}</option>
-								<option value="no-file">{{ i18n.ts._advancedSearch._fileOption.noFile }}</option>
-							</MkRadios>
-						</div>
-					</div>
-				</MkFolder>
-			</div>
 		</MkFolder>
 		<div>
 			<MkButton large primary gradate rounded style="margin: 0 auto;" @click="search">{{ i18n.ts.search }}</MkButton>
@@ -134,14 +118,12 @@ async function search() {
 			query: searchQuery.value,
 			userId: user.value ? user.value.id : null,
 			origin: searchOrigin.value,
-			fileOption: isfileOnly.value,
 		},
 	};
 
-	if(isfileOnly.value !== 'combined')
-	{
-		notePagination.value.endpoint = 'notes/search-file'
-		notePagination.value.params.fileOption = isfileOnly.value
+	if (isfileOnly.value !== 'combined') {
+		notePagination.value.endpoint = 'notes/search-file';
+		notePagination.value.params.fileOption = isfileOnly.value;
 	}
 	if (isLocalOnly.value) notePagination.value.params.host = '.';