diff --git a/README.md b/README.md
index 775cfe0..1056e03 100644
--- a/README.md
+++ b/README.md
@@ -153,28 +153,40 @@ zenvra/
 
 ### Setup
 
-```bash
-# Clone
-git clone https://github.com/Cameroon-Developer-Network/zenvra.git
-cd zenvra
-
-# Start infrastructure
-docker compose up -d
-
-# Configure environment
-cp .env.example .env
-# Add your ANTHROPIC_API_KEY and DATABASE_URL
-
-# Build Rust workspace
-cargo build
+1. **Clone the repository:**
+   ```bash
+   git clone https://github.com/Cameroon-Developer-Network/zenvra.git
+   cd zenvra
+   ```
+
+2. **Start infrastructure (Postgres & Redis):**
+   ```bash
+   # Starts only the necessary databases
+   docker compose up -d postgres redis
+   ```
+
+3. **Configure environment:**
+   ```bash
+   cp .env.example .env
+   # Open .env and add your AI provider keys (Anthropic, OpenAI, or Google)
+   # The default DATABASE_URL in .env.example works with the docker setup
+   ```
+
+4. **Start the Backend API:**
+   ```bash
+   cargo run -p zenvra-server
+   ```
+
+5. **Start the Dashboard (Frontend):**
+   ```bash
+   cd apps/web
+   npm install  # or pnpm install
+   npm run dev
+   ```
+
+### Quick Scan via CLI
 
-# Run all tests
-cargo test --all
-
-# Frontend
-cd apps/web && pnpm install && pnpm dev
-
-# Try the CLI
+```bash
 cargo run -p zenvra-cli -- scan ./path/to/code
 ```
 
diff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.ts
index 76f559e..fba5e5e 100644
--- a/apps/web/src/lib/api.ts
+++ b/apps/web/src/lib/api.ts
@@ -16,6 +16,7 @@ export interface ScanRequest {
   language?: string;
   engines?: string[];
   ai_config?: AiConfig;
+  min_severity?: 'critical' | 'high' | 'medium' | 'low' | 'info';
 }
 
 export interface Finding {
diff --git a/apps/web/src/lib/stores/usage.ts b/apps/web/src/lib/stores/usage.ts
new file mode 100644
index 0000000..3869b07
--- /dev/null
+++ b/apps/web/src/lib/stores/usage.ts
@@ -0,0 +1,13 @@
+import { writable } from 'svelte/store';
+import { getHistory } from '$lib/api';
+
+export const scanCount = writable<number>(0);
+
+export async function refreshScanCount() {
+  try {
+    const history = await getHistory();
+    scanCount.set(history.length);
+  } catch (e) {
+    console.error('Failed to refresh scan count:', e);
+  }
+}
diff --git a/apps/web/src/routes/+layout.svelte b/apps/web/src/routes/+layout.svelte
index e33f4b8..d8f9b33 100644
--- a/apps/web/src/routes/+layout.svelte
+++ b/apps/web/src/routes/+layout.svelte
@@ -1,8 +1,16 @@
 <script lang="ts">
   import "../app.css";
   import { page } from "$app/state";
+  import { scanCount, refreshScanCount } from "$lib/stores/usage";
+  import { onMount } from "svelte";
   let { children } = $props();
 
+  const maxScans = 10;
+
+  onMount(async () => {
+    await refreshScanCount();
+  });
+
   const navItems = [
     { name: "Dashboard", href: "/", icon: "layout-grid", disabled: false },
     { name: "Scan Code", href: "/scan", icon: "search", disabled: false },
@@ -56,9 +64,9 @@
         <p class="text-xs font-semibold text-zinc-500 uppercase tracking-wider mb-2">Usage Plan</p>
         <p class="text-sm font-medium mb-1">Free Tier</p>
         <div class="w-full bg-zinc-800 h-1.5 rounded-full overflow-hidden mt-2">
-          <div class="bg-brand-primary w-2/5 h-full rounded-full shadow-[0_0_8px_rgba(236,72,153,0.5)]"></div>
+          <div class="bg-brand-primary h-full rounded-full shadow-[0_0_8px_rgba(236,72,153,0.5)]" style="width: {($scanCount / maxScans) * 100}%"></div>
         </div>
-        <p class="text-[10px] text-zinc-500 mt-2">4/10 scans remaining</p>
+        <p class="text-[10px] text-zinc-500 mt-2">{maxScans - $scanCount}/{maxScans} scans remaining</p>
       </div>
     </div>
   </aside>
diff --git a/apps/web/src/routes/history/[id]/+page.svelte b/apps/web/src/routes/history/[id]/+page.svelte
index 10b4be4..d1154ff 100644
--- a/apps/web/src/routes/history/[id]/+page.svelte
+++ b/apps/web/src/routes/history/[id]/+page.svelte
@@ -31,7 +31,9 @@
 
   onMount(async () => {
     try {
-      findings = await getScanResults(scanId);
+      if (scanId) {
+        findings = await getScanResults(scanId);
+      }
     } catch (err: unknown) {
       const msg = err instanceof Error ? err.message : String(err);
       error = msg || "Failed to load scan results.";
diff --git a/apps/web/src/routes/scan/+page.svelte b/apps/web/src/routes/scan/+page.svelte
index bede41e..2b5abc5 100644
--- a/apps/web/src/routes/scan/+page.svelte
+++ b/apps/web/src/routes/scan/+page.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { type Finding } from "$lib/api";
   import { aiConfig } from "$lib/stores/aiConfig.svelte";
+  import { refreshScanCount } from "$lib/stores/usage";
 
   const LANGUAGES = [
     { value: "python",     label: "Python" },
@@ -20,6 +21,7 @@
   ];
 
   let selectedLanguage = $state("python");
+  let selectedMinSeverity = $state("info");
 
   let code = $state(`// Paste your code here to scan for vulnerabilities
 def get_user(user_id):
@@ -69,7 +71,8 @@ def get_user(user_id):
             api_key:  aiConfig.apiKey,
             model:    aiConfig.model,
             endpoint: aiConfig.endpoint || undefined,
-          } : undefined
+          } : undefined,
+          min_severity: selectedMinSeverity !== "info" ? selectedMinSeverity : undefined
         })
       });
 
@@ -95,6 +98,7 @@ def get_user(user_id):
             scanStatus = "Scan complete!";
             isScanning = false;
             eventSource.close();
+            refreshScanCount();
             break;
           case 'error':
             scanStatus = `Error: ${data.data}`;
@@ -106,8 +110,13 @@ def get_user(user_id):
 
       eventSource.onerror = () => {
         console.error("SSE connection failed");
-        isScanning = false;
-        eventSource.close();
+        scanStatus = "Connection lost. Reconnecting or finished.";
+        // We don't necessarily want to set isScanning to false here because SSE often reconnects automatically.
+        // But for Zenvra's simple model, we'll close it to avoid zombie states if the scan is actually done.
+        if (eventSource.readyState === EventSource.CLOSED || eventSource.readyState === EventSource.CONNECTING) {
+           isScanning = false;
+           eventSource.close();
+        }
       };
       
     } catch (error) {
@@ -144,7 +153,8 @@ def get_user(user_id):
             api_key:  aiConfig.apiKey,
             model:    aiConfig.model,
             endpoint: aiConfig.endpoint || undefined,
-          } : undefined
+          } : undefined,
+          min_severity: selectedMinSeverity !== "info" ? selectedMinSeverity : undefined
         })
       });
 
@@ -168,6 +178,7 @@ def get_user(user_id):
             scanStatus = "Scan complete!";
             isScanning = false;
             eventSource.close();
+            refreshScanCount();
             break;
           case 'error':
             scanStatus = `Error: ${data.data}`;
@@ -325,6 +336,21 @@ def get_user(user_id):
           </select>
         </div>
 
+        <!-- Severity Filter -->
+        <div class="flex items-center gap-3">
+          <label class="text-xs font-bold text-zinc-500 uppercase tracking-widest whitespace-nowrap">Min Severity</label>
+          <select
+            bind:value={selectedMinSeverity}
+            class="glass bg-zinc-900/80 px-3 py-2 rounded-xl border border-zinc-800 text-xs font-medium text-zinc-300 focus:ring-2 ring-brand-primary outline-none transition-all flex-1"
+          >
+            <option value="info">All (Info+)</option>
+            <option value="low">Low+</option>
+            <option value="medium">Medium+</option>
+            <option value="high">High+</option>
+            <option value="critical">Critical Only</option>
+          </select>
+        </div>
+
         <div class="flex-1 glass rounded-2xl overflow-hidden border-zinc-800 flex flex-col relative group">
           <div class="px-6 py-3 border-b border-border bg-zinc-900/50 flex items-center justify-between">
             <span class="text-xs font-bold text-zinc-500 uppercase tracking-widest">Input Code</span>
@@ -352,6 +378,20 @@ def get_user(user_id):
             </label>
           </div>
 
+          <div class="px-6 py-3 border-b border-border bg-zinc-900/50 flex items-center justify-between">
+            <span class="text-xs font-bold text-zinc-500 uppercase tracking-widest">Min Severity Filter</span>
+            <select
+              bind:value={selectedMinSeverity}
+              class="bg-transparent text-xs font-bold text-zinc-400 outline-none cursor-pointer"
+            >
+              <option value="info" class="bg-zinc-900">All Levels</option>
+              <option value="low" class="bg-zinc-900">Low+</option>
+              <option value="medium" class="bg-zinc-900">Medium+</option>
+              <option value="high" class="bg-zinc-900">High+</option>
+              <option value="critical" class="bg-zinc-900">Critical</option>
+            </select>
+          </div>
+
           <div class="flex-1 overflow-y-auto p-4 space-y-2 custom-scrollbar">
             {#if workspaceFiles.length === 0}
               <div class="flex flex-col items-center justify-center h-full text-center space-y-3 opacity-50 py-12">
@@ -391,6 +431,12 @@ def get_user(user_id):
           {#if findings.length > 0}
              <button onclick={() => { findings = []; scanProgress = 0; scanStatus = "Ready to scan"; }} class="text-xs text-zinc-500 hover:text-zinc-300 transition-colors">Clear</button>
           {/if}
+          {#if isScanning}
+            <div class="flex items-center gap-2">
+              <span class="w-1.5 h-1.5 rounded-full bg-emerald-500 animate-pulse"></span>
+              <span class="text-[10px] font-black text-emerald-500 uppercase tracking-tighter">Live Stream</span>
+            </div>
+          {/if}
         </div>
         
         <div class="flex-1 overflow-y-auto p-6 space-y-4 custom-scrollbar">
diff --git a/crates/scanner/src/engines/ai_code.rs b/crates/scanner/src/engines/ai_code.rs
index a3ba0e7..f0e0835 100644
--- a/crates/scanner/src/engines/ai_code.rs
+++ b/crates/scanner/src/engines/ai_code.rs
@@ -112,8 +112,8 @@ fn build_rules() -> Vec<AiCodeRule> {
         AiCodeRule {
             name: "Unauthenticated Route Handler",
             regex: NO_AUTH_ROUTE_REGEX.get_or_init(|| {
-                Regex::new(r"(?i)@(app|router)\.(delete|put|patch)\s*\([^)]+\)\s*\nasync\s+def\s+[a-z_]+\((?!.*\bauth\b|.*\bdepends\b|.*\btoken\b|.*\buser\b)")
-                    .unwrap()
+                // Simplified: detect the decorator. Manual filtering below.
+                Regex::new(r"(?i)@(app|router)\.(delete|put|patch)\s*\(").unwrap()
             })
             .clone(),
             severity: Severity::Medium,
@@ -151,8 +151,8 @@ fn build_rules() -> Vec<AiCodeRule> {
         AiCodeRule {
             name: "Plain HTTP Endpoint (No TLS)",
             regex: PLAIN_HTTP_REGEX.get_or_init(|| {
-                Regex::new(r#"(?i)(url\s*=\s*['"]http://(?!localhost|127\.0\.0\.1)|fetch\s*\(\s*['"]http://(?!localhost))"#)
-                    .unwrap()
+                // Simplified: detect http:// without localhost/127.0.0.1
+                Regex::new(r#"(?i)(url\s*=\s*['"]http://|fetch\s*\(\s*['"]http://)"#).unwrap()
             })
             .clone(),
             severity: Severity::Medium,
@@ -201,6 +201,24 @@ pub async fn run(config: &ScanConfig) -> Result<Vec<RawFinding>> {
 
         for rule in &rules {
             if rule.regex.is_match(line) {
+                // Manual filtering for rules that were simplified to avoid look-ahead panics
+                if rule.name == "Unauthenticated Route Handler" {
+                    let l = line.to_lowercase();
+                    if l.contains("auth")
+                        || l.contains("depends")
+                        || l.contains("token")
+                        || l.contains("user")
+                    {
+                        continue;
+                    }
+                }
+                if rule.name == "Plain HTTP Endpoint (No TLS)" {
+                    let l = line.to_lowercase();
+                    if l.contains("localhost") || l.contains("127.0.0.1") {
+                        continue;
+                    }
+                }
+
                 findings.push(RawFinding {
                     engine: Engine::AiCode,
                     cve_id: None,
diff --git a/crates/scanner/src/engines/sca.rs b/crates/scanner/src/engines/sca.rs
index a238254..81af094 100644
--- a/crates/scanner/src/engines/sca.rs
+++ b/crates/scanner/src/engines/sca.rs
@@ -5,7 +5,10 @@
 //! for known CVEs.  Returns `RawFinding`s with `Engine::Sca` and real CVE IDs
 //! wherever available.
 
-use crate::{finding::{RawFinding, Severity}, Engine, ScanConfig};
+use crate::{
+    finding::{RawFinding, Severity},
+    Engine, ScanConfig,
+};
 use anyhow::Result;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
@@ -81,7 +84,8 @@ fn parse_dependencies(config: &ScanConfig) -> Vec<Dependency> {
         parse_requirements_txt(code)
     } else if lower.ends_with("go.sum") {
         parse_go_sum(code)
-    } else if lower.ends_with("pom.xml") || (lower.ends_with(".xml") && code.contains("<groupId>")) {
+    } else if lower.ends_with("pom.xml") || (lower.ends_with(".xml") && code.contains("<groupId>"))
+    {
         parse_pom_xml(code)
     } else {
         // Try heuristic detection
@@ -109,7 +113,11 @@ fn parse_cargo_lock(content: &str) -> Vec<Dependency> {
         if line == "[[package]]" {
             // Flush previous
             if let (Some(name), Some(version)) = (current_name.take(), current_version.take()) {
-                deps.push(Dependency { name, version, ecosystem: "crates.io".to_string() });
+                deps.push(Dependency {
+                    name,
+                    version,
+                    ecosystem: "crates.io".to_string(),
+                });
             }
         } else if let Some(rest) = line.strip_prefix("name = ") {
             current_name = Some(rest.trim_matches('"').to_string());
@@ -119,7 +127,11 @@ fn parse_cargo_lock(content: &str) -> Vec<Dependency> {
     }
     // Flush last
     if let (Some(name), Some(version)) = (current_name, current_version) {
-        deps.push(Dependency { name, version, ecosystem: "crates.io".to_string() });
+        deps.push(Dependency {
+            name,
+            version,
+            ecosystem: "crates.io".to_string(),
+        });
     }
     deps
 }
@@ -195,8 +207,15 @@ fn parse_pom_xml(content: &str) -> Vec<Dependency> {
     };
     for cap in dep_re.captures_iter(content) {
         let name = cap[1].trim().to_string();
-        let version = cap.get(2).map(|m| m.as_str().trim().to_string()).unwrap_or_else(|| "unknown".to_string());
-        deps.push(Dependency { name, version, ecosystem: "Maven".to_string() });
+        let version = cap
+            .get(2)
+            .map(|m| m.as_str().trim().to_string())
+            .unwrap_or_else(|| "unknown".to_string());
+        deps.push(Dependency {
+            name,
+            version,
+            ecosystem: "Maven".to_string(),
+        });
     }
     deps
 }
@@ -263,11 +282,7 @@ async fn query_osv(deps: &[Dependency]) -> Result<Vec<(Dependency, Vec<OsvVuln>)
 
         let body = OsvBatchRequest { queries };
 
-        let response = client
-            .post(OSV_BATCH_URL)
-            .json(&body)
-            .send()
-            .await;
+        let response = client.post(OSV_BATCH_URL).json(&body).send().await;
 
         let response = match response {
             Ok(r) => r,
@@ -348,7 +363,10 @@ pub async fn run(config: &ScanConfig) -> Result<Vec<RawFinding>> {
                 cve_id,
                 cwe_id: None,
                 severity,
-                title: format!("Vulnerable dependency: {} v{} — {}", dep.name, dep.version, title),
+                title: format!(
+                    "Vulnerable dependency: {} v{} — {}",
+                    dep.name, dep.version, title
+                ),
                 vulnerable_code: format!("{}@{} ({})", dep.name, dep.version, dep.ecosystem),
                 description: Some(format!(
                     "{} (ID: {})",
diff --git a/crates/scanner/tests/integration.rs b/crates/scanner/tests/integration.rs
index c141484..3359b09 100644
--- a/crates/scanner/tests/integration.rs
+++ b/crates/scanner/tests/integration.rs
@@ -90,7 +90,8 @@ h = hashlib.md5(password).hexdigest()
     assert!(
         findings
             .iter()
-            .any(|f| f.title.to_lowercase().contains("md5") || f.title.to_lowercase().contains("hash")),
+            .any(|f| f.title.to_lowercase().contains("md5")
+                || f.title.to_lowercase().contains("hash")),
         "Expected a weak-hashing finding"
     );
 }
@@ -143,10 +144,7 @@ async fn secrets_detects_github_token() {
         .await
         .expect("scan should succeed");
 
-    assert!(
-        !findings.is_empty(),
-        "Expected a GitHub token finding"
-    );
+    assert!(!findings.is_empty(), "Expected a GitHub token finding");
 }
 
 #[tokio::test]
@@ -162,10 +160,7 @@ MIIEpAIBAAKCAQEA0Z3VR...
         .await
         .expect("scan should succeed");
 
-    assert!(
-        !findings.is_empty(),
-        "Expected a private key finding"
-    );
+    assert!(!findings.is_empty(), "Expected a private key finding");
     assert_eq!(findings[0].severity, Severity::Critical);
 }
 
@@ -252,7 +247,10 @@ async fn multi_engine_finds_multiple_issues() {
     let severities: Vec<&Severity> = findings.iter().map(|f| &f.severity).collect();
     let mut sorted = severities.clone();
     sorted.sort_by(|a, b| b.cmp(a));
-    assert_eq!(severities, sorted, "Findings should be sorted by severity descending");
+    assert_eq!(
+        severities, sorted,
+        "Findings should be sorted by severity descending"
+    );
 }
 
 // ─────────────────────────── SCA Engine (unit) ────────────────────────────────
diff --git a/crates/server/src/cve_sync/mod.rs b/crates/server/src/cve_sync/mod.rs
index 1e033eb..42b9372 100644
--- a/crates/server/src/cve_sync/mod.rs
+++ b/crates/server/src/cve_sync/mod.rs
@@ -333,7 +333,11 @@ async fn fetch_osv_vulns(
 
 /// Convert a CVSS score string like "7.5" to a severity label.
 fn cvss_score_to_severity(score: &str) -> &'static str {
-    let n: f32 = score.split('/').next().and_then(|s| s.parse().ok()).unwrap_or(5.0);
+    let n: f32 = score
+        .split('/')
+        .next()
+        .and_then(|s| s.parse().ok())
+        .unwrap_or(5.0);
     if n >= 9.0 {
         "critical"
     } else if n >= 7.0 {
diff --git a/crates/server/src/main.rs b/crates/server/src/main.rs
index e23a83c..4e0b75b 100644
--- a/crates/server/src/main.rs
+++ b/crates/server/src/main.rs
@@ -30,13 +30,17 @@ const MAX_SCAN_BODY_BYTES: usize = 512 * 1024;
 /// Rate-limit window duration.
 const RATE_WINDOW: Duration = Duration::from_secs(60);
 /// Maximum scan requests per IP per window.
-const RATE_LIMIT: u32 = 10;
+const RATE_LIMIT: u32 = 100;
 /// How long completed scan results are cached for late SSE subscribers (seconds).
 const RESULTS_CACHE_TTL_SECS: u64 = 300;
 
 /// Return `None` when `s` is empty, otherwise wrap it in `Some`.
 fn none_if_empty(s: &str) -> Option<&str> {
-    if s.is_empty() { None } else { Some(s) }
+    if s.is_empty() {
+        None
+    } else {
+        Some(s)
+    }
 }
 
 #[derive(Parser)]
@@ -61,6 +65,7 @@ struct ScanRequest {
     language: String,
     engines: Vec<String>,
     ai_config: Option<zenvra_scanner::ai::AiConfig>,
+    min_severity: Option<zenvra_scanner::Severity>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -68,6 +73,7 @@ struct WorkspaceScanRequest {
     files: Vec<WorkspaceFile>,
     engines: Vec<String>,
     ai_config: Option<zenvra_scanner::ai::AiConfig>,
+    min_severity: Option<zenvra_scanner::Severity>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -98,10 +104,13 @@ impl AppState {
     /// Returns `true` if the request is allowed, `false` if it should be rejected.
     fn check_rate_limit(&self, ip: &str) -> bool {
         let now = Instant::now();
-        let mut entry = self.rate_limits.entry(ip.to_string()).or_insert_with(|| RateEntry {
-            count: 0,
-            window_start: now,
-        });
+        let mut entry = self
+            .rate_limits
+            .entry(ip.to_string())
+            .or_insert_with(|| RateEntry {
+                count: 0,
+                window_start: now,
+            });
 
         if now.duration_since(entry.window_start) >= RATE_WINDOW {
             // Reset window
@@ -284,6 +293,7 @@ async fn run_scan(
 
     let (tx, _rx) = broadcast::channel(100);
     state.scans.insert(scan_id, tx.clone());
+    state.results.insert(scan_id, Vec::new());
 
     let engines = payload
         .engines
@@ -308,7 +318,27 @@ async fn run_scan(
     let state_task = Arc::clone(&state);
     let payload_lang = payload.language.clone();
 
-    // Spawn scan task
+    // ─── Phase 1: Initialize Scan Record ─────────────────────────────────────
+    // We MUST insert the scan record before any findings to avoid FK violations.
+    if let Err(e) = sqlx::query(
+        "INSERT INTO scans (id, language, target_name, findings_count, severity_counts) 
+         VALUES ($1, $2, $3, 0, $4)",
+    )
+    .bind(scan_id)
+    .bind(&payload_lang)
+    .bind("Manual Scan")
+    .bind(serde_json::to_value(std::collections::HashMap::<String, i32>::new()).unwrap())
+    .execute(&state.db)
+    .await
+    {
+        tracing::error!("Failed to initialize scan record {}: {}", scan_id, e);
+        return Err((
+            StatusCode::INTERNAL_SERVER_ERROR,
+            "Database initialization error".to_string(),
+        ));
+    }
+
+    // ─── Phase 2: Start Background Scan ──────────────────────────────────────
     tokio::spawn(async move {
         let (scan_tx, mut scan_rx) = tokio::sync::mpsc::unbounded_channel();
         let config_task = config.clone();
@@ -321,37 +351,27 @@ async fn run_scan(
 
         let mut findings = Vec::new();
         let mut severity_counts = std::collections::HashMap::new();
-        let mut all_events: Vec<ScanEvent> = Vec::new();
+        let min_sev = payload
+            .min_severity
+            .unwrap_or(zenvra_scanner::Severity::Info);
 
         while let Some(event) = scan_rx.recv().await {
-            // Cache event for late subscribers
-            all_events.push(event.clone());
-
-            // Broadcast to any connected SSE subscribers
-            if let Err(e) = tx.send(event.clone()) {
-                tracing::debug!("SSE broadcast error (no active subscribers?): {}", e);
+            // Apply severity filtering and caching
+            if let ScanEvent::Finding(ref f) = event {
+                if f.severity < min_sev {
+                    continue;
+                }
+            }
+            if let Some(mut cached) = state_task.results.get_mut(&scan_id) {
+                cached.push(event.clone());
             }
+            let _ = tx.send(event.clone());
 
-            // Process specific events for DB persistence
             match event {
-                ScanEvent::Finding(mut finding) => {
+                ScanEvent::Finding(finding) => {
                     let sev_str = finding.severity.to_string().to_lowercase();
                     *severity_counts.entry(sev_str).or_insert(0) += 1;
 
-                    // Enrich from local DB
-                    if let Some(cve_id) = &finding.cve_id {
-                        if let Ok(Some(row)) = sqlx::query(
-                            "SELECT title, description FROM vulnerabilities WHERE cve_id = $1",
-                        )
-                        .bind(cve_id)
-                        .fetch_optional(&state_task.db)
-                        .await
-                        {
-                            use sqlx::Row;
-                            finding.title = row.get("title");
-                        }
-                    }
-
                     // Persist individual finding
                     if let Err(e) = sqlx::query(
                         "INSERT INTO scan_results (scan_id, engine, cve_id, cwe_id, severity, title, description, explanation, vulnerable_code, fixed_code, line_start, line_end, file_path)
@@ -374,25 +394,18 @@ async fn run_scan(
                     .await {
                         tracing::error!("Failed to persist finding for scan {}: {}", scan_id, e);
                     }
-
                     findings.push(*finding);
                 }
                 ScanEvent::Complete => {
-                    // Finalize scan record
-                    if let Err(e) = sqlx::query(
-                        "INSERT INTO scans (id, language, target_name, findings_count, severity_counts) 
-                         VALUES ($1, $2, $3, $4, $5) 
-                         ON CONFLICT (id) DO UPDATE SET findings_count = $4, severity_counts = $5"
+                    // Update scan record with final counts
+                    let _ = sqlx::query(
+                        "UPDATE scans SET findings_count = $1, severity_counts = $2 WHERE id = $3",
                     )
-                    .bind(scan_id)
-                    .bind(payload_lang)
-                    .bind("Manual Scan")
                     .bind(findings.len() as i32)
-                    .bind(serde_json::to_value(&severity_counts).unwrap_or(serde_json::Value::Object(Default::default())))
+                    .bind(serde_json::to_value(&severity_counts).unwrap())
+                    .bind(scan_id)
                     .execute(&state_task.db)
-                    .await {
-                        tracing::error!("Failed to finalize scan {}: {}", scan_id, e);
-                    }
+                    .await;
 
                     tracing::info!("Scan completed and persisted: {}", scan_id);
                     break;
@@ -405,9 +418,8 @@ async fn run_scan(
             }
         }
 
-        // Move results to cache so late SSE subscribers can replay them
+        // Mark as finished by removing from live scans
         state_task.scans.remove(&scan_id);
-        state_task.results.insert(scan_id, all_events);
 
         // Clean up results cache after TTL
         tokio::time::sleep(tokio::time::Duration::from_secs(RESULTS_CACHE_TTL_SECS)).await;
@@ -442,8 +454,8 @@ async fn run_workspace_scan(
         ));
     }
 
-    let payload: WorkspaceScanRequest =
-        serde_json::from_slice(&body).map_err(|e| (StatusCode::UNPROCESSABLE_ENTITY, e.to_string()))?;
+    let payload: WorkspaceScanRequest = serde_json::from_slice(&body)
+        .map_err(|e| (StatusCode::UNPROCESSABLE_ENTITY, e.to_string()))?;
 
     let scan_id = Uuid::new_v4();
     tracing::info!(
@@ -454,6 +466,7 @@ async fn run_workspace_scan(
 
     let (tx, _rx) = broadcast::channel(100);
     state.scans.insert(scan_id, tx.clone());
+    state.results.insert(scan_id, Vec::new());
 
     let engines: Vec<zenvra_scanner::Engine> = payload
         .engines
@@ -483,76 +496,88 @@ async fn run_workspace_scan(
 
     let tx_task = tx.clone();
     let state_task = state.clone();
+    let payload_workspace_name = "Workspace Scan".to_string();
 
-    // Spawn scan task
+    // ─── Phase 1: Initialize Workspace Record ────────────────────────────────
+    if let Err(e) = sqlx::query(
+        "INSERT INTO scans (id, language, target_name, findings_count, severity_counts) 
+         VALUES ($1, $2, $3, 0, $4)",
+    )
+    .bind(scan_id)
+    .bind("Workspace")
+    .bind(&payload_workspace_name)
+    .bind(serde_json::to_value(std::collections::HashMap::<String, i32>::new()).unwrap())
+    .execute(&state.db)
+    .await
+    {
+        tracing::error!("Failed to initialize workspace record {}: {}", scan_id, e);
+        return Err((
+            StatusCode::INTERNAL_SERVER_ERROR,
+            "Database initialization error".to_string(),
+        ));
+    }
+
+    // ─── Phase 2: Start Background Scan ──────────────────────────────────────
     tokio::spawn(async move {
         let (scan_tx, mut scan_rx) = tokio::sync::mpsc::unbounded_channel();
         let config_task = config.clone();
 
         tokio::spawn(async move {
             if let Err(e) = zenvra_scanner::scan_workspace_stream(config_task, scan_tx).await {
-                tracing::error!("Scanner stream error: {}", e);
+                tracing::error!("Workspace scanner stream error: {}", e);
             }
         });
 
         let mut findings = Vec::new();
         let mut severity_counts = std::collections::HashMap::new();
-        let mut all_events: Vec<ScanEvent> = Vec::new();
+        let min_sev = payload
+            .min_severity
+            .unwrap_or(zenvra_scanner::Severity::Info);
 
         while let Some(event) = scan_rx.recv().await {
-            all_events.push(event.clone());
+            if let ScanEvent::Finding(ref f) = event {
+                if f.severity < min_sev {
+                    continue;
+                }
+            }
+            if let Some(mut cached) = state_task.results.get_mut(&scan_id) {
+                cached.push(event.clone());
+            }
             let _ = tx_task.send(event.clone());
 
-            if let ScanEvent::Finding(finding) = event {
-                let sev_str = finding.severity.to_string().to_lowercase();
-                *severity_counts.entry(sev_str).or_insert(0) += 1;
-
-                // Persist individual finding
-                if let Err(e) = sqlx::query(
-                    "INSERT INTO scan_results (scan_id, engine, cve_id, cwe_id, severity, title, description, explanation, vulnerable_code, fixed_code, line_start, line_end, file_path)
-                     VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)"
-                )
-                .bind(scan_id)
-                .bind(format!("{:?}", finding.engine))
-                .bind(&finding.cve_id)
-                .bind(&finding.cwe_id)
-                .bind(finding.severity.to_string())
-                .bind(&finding.title)
-                .bind(&finding.description)
-                .bind(none_if_empty(&finding.explanation))
-                .bind(&finding.vulnerable_code)
-                .bind(none_if_empty(&finding.fixed_code))
-                .bind(finding.line_start as i32)
-                .bind(finding.line_end as i32)
-                .bind(&finding.file_path)
-                .execute(&state_task.db)
-                .await {
-                    tracing::error!("Failed to persist workspace finding: {}", e);
+            match event {
+                ScanEvent::Finding(finding) => {
+                    let sev_str = finding.severity.to_string().to_lowercase();
+                    *severity_counts.entry(sev_str).or_insert(0) += 1;
+
+                    // Persist individual finding
+                    let _ = sqlx::query(
+                        "INSERT INTO scan_results (scan_id, engine, cve_id, cwe_id, severity, title, description, explanation, vulnerable_code, fixed_code, line_start, line_end, file_path)
+                         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)"
+                    )
+                    .bind(scan_id).bind(format!("{:?}", finding.engine)).bind(&finding.cve_id).bind(&finding.cwe_id)
+                    .bind(finding.severity.to_string()).bind(&finding.title).bind(&finding.description)
+                    .bind(none_if_empty(&finding.explanation)).bind(&finding.vulnerable_code)
+                    .bind(none_if_empty(&finding.fixed_code)).bind(finding.line_start as i32)
+                    .bind(finding.line_end as i32).bind(&finding.file_path)
+                    .execute(&state_task.db).await;
+                    findings.push(*finding);
                 }
-                findings.push(*finding);
-            } else if matches!(event, ScanEvent::Complete) {
-                // Finalize scan record
-                if let Err(e) = sqlx::query(
-                    "INSERT INTO scans (id, language, target_name, findings_count, severity_counts) 
-                     VALUES ($1, $2, $3, $4, $5)"
-                )
-                .bind(scan_id)
-                .bind("Workspace") // Multi-file
-                .bind("Workspace Scan")
-                .bind(findings.len() as i32)
-                .bind(serde_json::to_value(&severity_counts).unwrap_or(serde_json::Value::Object(Default::default())))
-                .execute(&state_task.db)
-                .await {
-                    tracing::error!("Failed to finalize workspace scan: {}", e);
+                ScanEvent::Complete => {
+                    let _ = sqlx::query(
+                        "UPDATE scans SET findings_count = $1, severity_counts = $2 WHERE id = $3",
+                    )
+                    .bind(findings.len() as i32)
+                    .bind(serde_json::to_value(&severity_counts).unwrap())
+                    .bind(scan_id)
+                    .execute(&state_task.db)
+                    .await;
+                    break;
                 }
-                break;
+                _ => {}
             }
         }
-
-        // Cache events for late SSE subscribers (5-minute TTL)
         state_task.scans.remove(&scan_id);
-        state_task.results.insert(scan_id, all_events);
-
         tokio::time::sleep(tokio::time::Duration::from_secs(RESULTS_CACHE_TTL_SECS)).await;
         state_task.results.remove(&scan_id);
     });
@@ -568,34 +593,51 @@ async fn subscribe_to_scan(
 
     type BoxedStream = std::pin::Pin<Box<dyn Stream<Item = Result<Event, Infallible>> + Send>>;
 
-    // Case 1: Scan already completed — replay cached events immediately
-    let stream: BoxedStream = if let Some(cached) = state.results.get(&id) {
-        let events: Vec<ScanEvent> = cached.clone();
-        Box::pin(
-            stream::iter(events).map(move |event| -> Result<Event, Infallible> {
+    // Use a multi-stage stream: catch up from cache, then switch to live.
+    // We subscribe first to ensure we don't miss anything that happens during the catch-up.
+    let rx = state.scans.get(&id).map(|tx| tx.subscribe());
+
+    let cached_events = state
+        .results
+        .get(&id)
+        .map(|c| c.clone())
+        .unwrap_or_default();
+    let num_cached = cached_events.len();
+
+    let past_stream = stream::iter(cached_events).map(|event| -> Result<Event, Infallible> {
+        Ok(Event::default()
+            .json_data(&event)
+            .unwrap_or_else(|_| Event::default()))
+    });
+
+    let stream: BoxedStream = if let Some(rx) = rx {
+        // Scan is ongoing
+        let mut seen_count = 0;
+        let live_stream = tokio_stream::wrappers::BroadcastStream::new(rx)
+            .filter_map(|msg| msg.ok())
+            .filter(move |_| {
+                // Skip the first N events that were already in our cache clone
+                // This is a simple heuristic; a real implementation would use event IDs.
+                if seen_count < num_cached {
+                    seen_count += 1;
+                    false
+                } else {
+                    true
+                }
+            })
+            .map(|event| -> Result<Event, Infallible> {
                 Ok(Event::default()
-                    .json_data(&event)
+                    .json_data(event)
                     .unwrap_or_else(|_| Event::default()))
-            }),
-        )
+            });
+
+        Box::pin(past_stream.chain(live_stream))
     } else {
-        // Case 2: Scan is still in progress — subscribe to live broadcast
-        let tx = state
-            .scans
-            .get(&id)
-            .ok_or((StatusCode::NOT_FOUND, "Scan not found".to_string()))?
-            .clone();
-
-        let rx = tx.subscribe();
-        Box::pin(
-            tokio_stream::wrappers::BroadcastStream::new(rx)
-                .filter_map(|msg: Result<ScanEvent, _>| msg.ok())
-                .map(|event: ScanEvent| -> Result<Event, Infallible> {
-                    Ok(Event::default()
-                        .json_data(event)
-                        .unwrap_or_else(|_| Event::default()))
-                }),
-        )
+        // Scan is already complete (or doesn't exist)
+        if num_cached == 0 {
+            return Err((StatusCode::NOT_FOUND, "Scan not found".to_string()));
+        }
+        Box::pin(past_stream)
     };
 
     Ok(Sse::new(stream).keep_alive(axum::response::sse::KeepAlive::default()))
@@ -651,6 +693,8 @@ async fn get_history(
         .await
         .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
 
+    tracing::info!("Fetched {} scans from history", scans.len());
+
     let mut results = Vec::new();
     for row in scans {
         use sqlx::Row;