diff --git a/src/api/useCqlLibraryServiceApi.tsx b/src/api/useCqlLibraryServiceApi.tsx
index d350d85..b011950 100644
--- a/src/api/useCqlLibraryServiceApi.tsx
+++ b/src/api/useCqlLibraryServiceApi.tsx
@@ -20,8 +20,8 @@ export class CqlLibraryServiceApi {
           },
           params: {
             currentUser: filterByCurrentUser,
-            signal,
           },
+          signal: signal,
         }
       );
       return response.data;
diff --git a/src/components/cqlLibraryLanding/CqlLibraryLanding.tsx b/src/components/cqlLibraryLanding/CqlLibraryLanding.tsx
index 0b97918..f0b6c3a 100644
--- a/src/components/cqlLibraryLanding/CqlLibraryLanding.tsx
+++ b/src/components/cqlLibraryLanding/CqlLibraryLanding.tsx
@@ -80,7 +80,9 @@ function CqlLibraryLanding() {
   const submitFilter = (e) => {
     e.preventDefault();
     setFilter(filter.trim());
-    setCurrentFilter(filter);
+    if (cqlLibraryList != null && cqlLibraryList.length > 0) {
+      setCurrentFilter(filter);
+    }
   };
 
   const searchInputProps = {