diff --git a/src/components/EntryList.svelte b/src/components/EntryList.svelte
index 4a27cf8..31f1678 100644
--- a/src/components/EntryList.svelte
+++ b/src/components/EntryList.svelte
@@ -35,12 +35,11 @@
     loading = false
   }
 
-  loadEntries()
-
-  // Reload when search or filter changes (polling-based reactivity)
-  const intervalId = setInterval(loadEntries, 1000)
+  // Reload when search query or active group filter changes
   $effect(() => {
-    return () => clearInterval(intervalId)
+    searchStore.query
+    searchStore.activeGroupId
+    loadEntries()
   })
 </script>
 
diff --git a/src/components/LockScreen.svelte b/src/components/LockScreen.svelte
index 7e29f96..4630bfb 100644
--- a/src/components/LockScreen.svelte
+++ b/src/components/LockScreen.svelte
@@ -86,7 +86,7 @@
       <div class="error-banner" role="alert">{error}</div>
     {/if}
 
-    <form submitHandler={handleSubmit} class="lock-form">
+    <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="lock-form">
       <div class="form-group">
         <label for="master-password">Master Password</label>
         <input
diff --git a/src/components/Sidebar.svelte b/src/components/Sidebar.svelte
index e22e969..32a0c1a 100644
--- a/src/components/Sidebar.svelte
+++ b/src/components/Sidebar.svelte
@@ -28,12 +28,6 @@
   }
   loadData()
 
-  // Reload periodically
-  const intervalId = setInterval(loadData, 3000)
-  $effect(() => {
-    return () => clearInterval(intervalId)
-  })
-
   function openGroupForm(group = null) {
     if (group) {
       editingGroupId = group.id
diff --git a/src/lib/crypto/crypto.js b/src/lib/crypto/crypto.js
index e4dbc0f..3347673 100644
--- a/src/lib/crypto/crypto.js
+++ b/src/lib/crypto/crypto.js
@@ -7,6 +7,8 @@
  * The derived encryption key is kept in memory only — never written to disk.
  */
 
+import { generateId } from '../models/schema.js'
+
 const PBKDF2_ITERATIONS = 100_000
 const SALT_LENGTH = 16 // bytes
 const IV_LENGTH = 12   // bytes (recommended for AES-GCM)