diff --git a/manifest.json b/manifest.json
index fcffcb3..0adf486 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-book-tracker",
 	"name": "Book Tracker",
-	"version": "1.6.1",
+	"version": "1.7.0",
 	"minAppVersion": "0.15.0",
 	"description": "Simplifies tracking your reading progress and managing your book collection in Obsidian.",
 	"author": "FiFiTiDo",
diff --git a/package.json b/package.json
index fa67faf..588c3f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-book-tracker",
-	"version": "1.6.1",
+	"version": "1.7.0",
 	"description": "Simplifies tracking your reading progress and managing your book collection in Obsidian.",
 	"main": "main.js",
 	"scripts": {
diff --git a/src/ui/components/setting/FileSuggestItem.svelte b/src/ui/components/setting/FileSuggestItem.svelte
index 32b04cd..c2a1d05 100644
--- a/src/ui/components/setting/FileSuggestItem.svelte
+++ b/src/ui/components/setting/FileSuggestItem.svelte
@@ -13,6 +13,6 @@
 
 <Item {name} {description}>
 	{#snippet control()}
-		<FileSuggest {id} asString bind:value />
+		<FileSuggest {id} bind:value />
 	{/snippet}
 </Item>
diff --git a/src/ui/components/setting/FolderSuggestItem.svelte b/src/ui/components/setting/FolderSuggestItem.svelte
index 767cf36..805ef36 100644
--- a/src/ui/components/setting/FolderSuggestItem.svelte
+++ b/src/ui/components/setting/FolderSuggestItem.svelte
@@ -13,6 +13,6 @@
 
 <Item {name} {description}>
 	{#snippet control()}
-		<FolderSuggest {id} asString bind:value />
+		<FolderSuggest {id} bind:value />
 	{/snippet}
 </Item>
diff --git a/src/ui/components/setting/PropertySuggestItem.svelte b/src/ui/components/setting/PropertySuggestItem.svelte
index f5a09a8..4971356 100644
--- a/src/ui/components/setting/PropertySuggestItem.svelte
+++ b/src/ui/components/setting/PropertySuggestItem.svelte
@@ -20,6 +20,6 @@
 
 <Item {name} {description}>
 	{#snippet control()}
-		<PropertySuggest {id} asString bind:value {accepts} />
+		<PropertySuggest {id} bind:value {accepts} />
 	{/snippet}
 </Item>
diff --git a/src/ui/components/suggesters/FileSuggest.svelte b/src/ui/components/suggesters/FileSuggest.svelte
index 12785e0..d0fdabd 100644
--- a/src/ui/components/suggesters/FileSuggest.svelte
+++ b/src/ui/components/suggesters/FileSuggest.svelte
@@ -3,42 +3,39 @@
 	import TextInputSuggest, { type Item } from "./TextInputSuggest.svelte";
 	import type { StringKeys } from "@utils/types";
 	import { getAppContext } from "@ui/stores/app";
+	import { isInAnyFolder } from "@utils/fs";
 
 	type Props = {
 		id: string;
-		asString?: boolean;
 		property?: StringKeys<TFile>;
-		inFolder?: string;
-		value?: TFile | string;
+		folderFilter?: string[];
+		value?: string;
 		disabled?: boolean;
-		onSelected?: (fileOrPath: TFile | string) => void;
+		onSelected?: (propertyValue: string) => void;
 	};
 
 	let {
 		id,
-		asString,
 		property = "path",
-		inFolder,
+		folderFilter,
 		value = $bindable(),
 		disabled,
 		onSelected,
 	}: Props = $props();
 	const app = getAppContext();
 
-	let items: Item<TFile | string>[] = $state([]);
+	let items: Item<string>[] = $state([]);
 
 	function handleChange(query: string) {
 		items = app.vault
 			.getMarkdownFiles()
 			.filter(
 				(f) =>
-					(inFolder === undefined || f.path.startsWith(inFolder)) &&
+					(folderFilter === undefined ||
+						isInAnyFolder(f, folderFilter)) &&
 					f[property].toLowerCase().includes(query.toLowerCase()),
 			)
-			.map((f) => ({
-				text: f[property],
-				value: asString ? f[property] : f,
-			}));
+			.map((f) => f[property]);
 	}
 </script>
 
diff --git a/src/ui/components/suggesters/FolderSuggest.svelte b/src/ui/components/suggesters/FolderSuggest.svelte
index 0138c3a..474db4a 100644
--- a/src/ui/components/suggesters/FolderSuggest.svelte
+++ b/src/ui/components/suggesters/FolderSuggest.svelte
@@ -3,22 +3,21 @@
 	import TextInputSuggest, { type Item } from "./TextInputSuggest.svelte";
 	import type { StringKeys } from "@utils/types";
 	import { getAppContext } from "@ui/stores/app";
+	import { isInAnyFolder } from "@utils/fs";
 
 	type Props = {
 		id: string;
-		asString?: boolean;
 		property?: StringKeys<TFolder>;
-		inFolder?: string;
-		value?: TFolder | string;
+		folderFilter?: string[];
+		value?: string;
 		disabled?: boolean;
-		onSelected?: (folderOrPath: TFolder | string) => void;
+		onSelected?: (propertyValue: string) => void;
 	};
 
 	let {
 		id,
-		asString,
 		property = "path",
-		inFolder,
+		folderFilter,
 		value = $bindable(),
 		disabled,
 		onSelected,
@@ -32,13 +31,11 @@
 			.getAllFolders()
 			.filter(
 				(f) =>
-					(inFolder === undefined || f.path.startsWith(inFolder)) &&
+					(folderFilter === undefined ||
+						isInAnyFolder(f, folderFilter)) &&
 					f[property].toLowerCase().includes(query.toLowerCase()),
 			)
-			.map((f) => ({
-				text: f[property],
-				value: asString ? f[property] : f,
-			}));
+			.map((f) => f[property]);
 	}
 </script>
 
diff --git a/src/ui/components/suggesters/PropertySuggest.svelte b/src/ui/components/suggesters/PropertySuggest.svelte
index f41b808..3ce023e 100644
--- a/src/ui/components/suggesters/PropertySuggest.svelte
+++ b/src/ui/components/suggesters/PropertySuggest.svelte
@@ -12,16 +12,14 @@
 
 	type Props = {
 		id: string;
-		asString?: boolean;
-		value?: Property | string;
+		value?: string;
 		accepts?: string[];
 		disabled?: boolean;
-		onSelected?: (propertyOrName: Property | string) => void;
+		onSelected?: (propertyName: string) => void;
 	};
 
 	let {
 		id,
-		asString,
 		value = $bindable(),
 		accepts,
 		disabled,
@@ -29,7 +27,7 @@
 	}: Props = $props();
 	const app = getAppContext();
 
-	let items: Item<Property | string>[] = $state([]);
+	let items: Item<string>[] = $state([]);
 
 	async function handleChange(query: string) {
 		const typesContent = await app.vault.adapter.read(
@@ -45,10 +43,7 @@
 
 				return name.toLowerCase().includes(query.toLowerCase());
 			})
-			.map(([name, type]) => ({
-				text: name,
-				value: asString ? name : { name, type },
-			}));
+			.map(([name, _]) => name);
 	}
 </script>
 
diff --git a/src/ui/components/suggesters/TextInputSuggest.svelte b/src/ui/components/suggesters/TextInputSuggest.svelte
index fd1e430..0f9ed10 100644
--- a/src/ui/components/suggesters/TextInputSuggest.svelte
+++ b/src/ui/components/suggesters/TextInputSuggest.svelte
@@ -1,8 +1,10 @@
 <script lang="ts" module>
-	export type Item<T> = {
-		text: string;
-		value: T;
-	};
+	export type Item<T> =
+		| {
+				label: string;
+				value: T;
+		  }
+		| (T extends string ? T : never);
 </script>
 
 <script lang="ts">
@@ -26,7 +28,7 @@
 
 	let {
 		id,
-		items,
+		items: itemsProp,
 		value = $bindable(),
 		loading = false,
 		suggestion,
@@ -35,6 +37,12 @@
 		onSelected,
 	}: Props = $props();
 
+	const items = $derived(
+		itemsProp.map((item) =>
+			typeof item === "string" ? { label: item, value: item } : item,
+		),
+	);
+
 	let query = $state("");
 	let expanded = $state(false);
 	let selectedIndex = $state(0);
@@ -53,7 +61,7 @@
 			const idx = findIndex(value);
 			if (idx !== -1) {
 				const item = items[idx];
-				query = item.text;
+				query = item.label;
 				selectedIndex = idx;
 			}
 		});
@@ -99,7 +107,7 @@
 	async function selectItem(index: number) {
 		const item = items[index];
 		if (!item) return;
-		const { text: newQuery, value: newValue } = item;
+		const { label: newQuery, value: newValue } = item;
 		selectedIndex = index;
 		expanded = false;
 		query = newQuery;
@@ -195,7 +203,7 @@
 						{#if suggestion}
 							{@render suggestion(item)}
 						{:else}
-							{item.text}
+							{item.label}
 						{/if}
 					</li>
 				{/each}
diff --git a/src/ui/modals/ReadingLogEntryEditModalView.svelte b/src/ui/modals/ReadingLogEntryEditModalView.svelte
index 80c5421..6b7b24c 100644
--- a/src/ui/modals/ReadingLogEntryEditModalView.svelte
+++ b/src/ui/modals/ReadingLogEntryEditModalView.svelte
@@ -108,9 +108,11 @@
 			<label for="book">Book</label>
 			<FileSuggest
 				id="book"
-				asString
 				property="basename"
-				inFolder={plugin.settings.bookFolder}
+				folderFilter={[
+					plugin.settings.tbrFolder,
+					plugin.settings.readBooksFolder,
+				]}
 				bind:value={book}
 			/>
 			<label for="pagesRead">Pages Read</label>
diff --git a/src/ui/settings/BookTrackerSettingTabView.svelte b/src/ui/settings/BookTrackerSettingTabView.svelte
index 3efbaf3..673812d 100644
--- a/src/ui/settings/BookTrackerSettingTabView.svelte
+++ b/src/ui/settings/BookTrackerSettingTabView.svelte
@@ -170,35 +170,29 @@
 
 <div class="obt-settings">
 	<Header title="Folders" />
-	<FolderSuggestItem
-		id="book-folder"
-		name="Book Folder"
-		description="Select the folder where book entries are stored."
-		bind:value={settingsStore.settings.bookFolder}
-	/>
 	<FolderSuggestItem
 		id="tbr-folder"
 		name="To Be Read Folder"
-		description="Select the folder to use for To Be Read entries"
+		description="The folder to use for To Be Read or Currently Reading book entries."
 		bind:value={settingsStore.settings.tbrFolder}
 	/>
 	<FolderSuggestItem
 		id="read-folder"
 		name="Read Books Folder"
-		description="Select the folder to use for Read entries."
+		description="The folder to use for Read book entries."
 		bind:value={settingsStore.settings.readBooksFolder}
 	/>
 	<ToggleItem
 		id="organize-read-books"
 		name="Organize Read Books"
-		description="Organize read books into folders based on the date read."
+		description="Whether to automatically organize read books into folders, based on the date read, when finishing a book."
 		bind:checked={settingsStore.settings.organizeReadBooks}
 	/>
 	<Header title="Book Creation" />
 	<FileSuggestItem
 		id="template-file"
 		name="Template File"
-		description="Select the template file to use for new book entries."
+		description="The template file to use when creating new book entries."
 		bind:value={settingsStore.settings.templateFile}
 	/>
 	<TextInputItem
diff --git a/src/ui/settings/types.ts b/src/ui/settings/types.ts
index fdd9a0c..c7c133b 100644
--- a/src/ui/settings/types.ts
+++ b/src/ui/settings/types.ts
@@ -1,5 +1,4 @@
 export interface BookTrackerSettings {
-	bookFolder: string;
 	tbrFolder: string;
 	readBooksFolder: string;
 	organizeReadBooks: boolean;
@@ -34,7 +33,6 @@ export interface BookTrackerSettings {
 }
 
 export const DEFAULT_SETTINGS: BookTrackerSettings = {
-	bookFolder: "books",
 	tbrFolder: "books/tbr",
 	readBooksFolder: "books/read",
 	organizeReadBooks: true,
diff --git a/src/utils/fs.ts b/src/utils/fs.ts
index d5b0db5..cf0b2a0 100644
--- a/src/utils/fs.ts
+++ b/src/utils/fs.ts
@@ -1,4 +1,4 @@
-import { normalizePath, type Vault } from "obsidian";
+import { normalizePath, TAbstractFile, type Vault } from "obsidian";
 
 /**
  * A simple analog of Node.js's `path.join(...)`.
@@ -52,3 +52,7 @@ export async function mkdirRecursive(
 		await vault.adapter.mkdir(stack.pop()!);
 	}
 }
+
+export function isInAnyFolder(file: TAbstractFile, folders: string[]): boolean {
+	return folders.some((folder) => file.path.startsWith(folder));
+}
diff --git a/versions.json b/versions.json
index 92e16b2..ac13235 100644
--- a/versions.json
+++ b/versions.json
@@ -10,5 +10,6 @@
 	"1.4.2": "0.15.0",
 	"1.5.0": "0.15.0",
 	"1.6.0": "0.15.0",
-	"1.6.1": "0.15.0"
+	"1.6.1": "0.15.0",
+	"1.7.0": "0.15.0"
 }
\ No newline at end of file