diff --git a/src/components/FindNotebooksCommand.tsx b/src/components/FindNotebooksCommand.tsx
index 963de2b..80bd0ee 100644
--- a/src/components/FindNotebooksCommand.tsx
+++ b/src/components/FindNotebooksCommand.tsx
@@ -51,7 +51,7 @@ export default function FindNotebooksCommand({ src }: { src: Sourcegraph }) {
       selectedItemId={length > 0 ? "first-result" : undefined}
       throttle
     >
-      {!loading && !searchText ? (
+      {!loading && !searchText && (
         <List.Section title={"Suggestions"}>
           <List.Item
             title="Create a search notebook"
@@ -63,17 +63,15 @@ export default function FindNotebooksCommand({ src }: { src: Sourcegraph }) {
             }
           />
         </List.Section>
-      ) : (
-        <Fragment />
       )}
 
-      {notebooks && (
-        <List.Section title={searchText ? "Notebooks" : "Recent notebooks"}>
-          {notebooks.map((n, i) => (
-            <NotebookResultItem id={i === 0 ? "first-result" : undefined} key={nanoid()} notebook={n} src={src} />
-          ))}
-        </List.Section>
-      )}
+      {loading && length === 0 && <List.EmptyView icon={Icon.MugSteam} title={"Loading..."} />}
+
+      <List.Section title={searchText ? "Notebooks" : "Recent notebooks"}>
+        {notebooks?.map((n, i) => (
+          <NotebookResultItem id={i === 0 ? "first-result" : undefined} key={nanoid()} notebook={n} src={src} />
+        ))}
+      </List.Section>
     </List>
   );
 }
diff --git a/src/components/ManageBatchChangesCommand.tsx b/src/components/ManageBatchChangesCommand.tsx
index 226376f..9cc0a25 100644
--- a/src/components/ManageBatchChangesCommand.tsx
+++ b/src/components/ManageBatchChangesCommand.tsx
@@ -1,6 +1,6 @@
 import { ActionPanel, List, Action, Icon, useNavigation, Toast, Image, Color, showToast, Form } from "@raycast/api";
 import { getProgressIcon } from "@raycast/utils";
-import { useState, Fragment, useMemo, useEffect } from "react";
+import { useState, useMemo, useEffect } from "react";
 import { DateTime } from "luxon";
 import { nanoid } from "nanoid";
 
@@ -57,10 +57,10 @@ export default function ManageBatchChanges({ src }: { src: Sourcegraph }) {
       isLoading={loading}
       searchBarPlaceholder={`Manage batch changes on ${srcName}`}
       onSearchTextChange={setSearchText}
-      enableFiltering={true}
+      filtering={true}
       selectedItemId={showSuggestions ? "first-result" : undefined}
     >
-      {showSuggestions ? (
+      {showSuggestions && (
         <List.Section title={"Suggestions"}>
           <List.Item
             title="Create a batch change"
@@ -72,8 +72,6 @@ export default function ManageBatchChanges({ src }: { src: Sourcegraph }) {
             }
           />
         </List.Section>
-      ) : (
-        <Fragment />
       )}
 
       <List.Section title={"Batch changes"}>
diff --git a/src/findNotebooksInstance.tsx b/src/findNotebooksInstance.tsx
index 3e0e518..a052892 100644
--- a/src/findNotebooksInstance.tsx
+++ b/src/findNotebooksInstance.tsx
@@ -1,6 +1,6 @@
 import FindNotebooksCommand from "./components/FindNotebooksCommand";
 import InstanceCommand from "./components/InstanceCommand";
 
-export default async function FindNotebooksInstance() {
+export default function FindNotebooksInstance() {
   return <InstanceCommand Command={FindNotebooksCommand} />;
 }