diff --git a/app.go b/app.go
index 3ad6bd8..79929f2 100644
--- a/app.go
+++ b/app.go
@@ -138,3 +138,25 @@ func (a *App) GetCharacterLocations() ([]CharacterLocation, error) {
 	defer cancel()
 	return a.ssi.GetCharacterLocations(ctx)
 }
+
+// SystemRegion holds system + region names from local DB
+type SystemRegion struct {
+	System string `json:"system"`
+	Region string `json:"region"`
+}
+
+// ListSystemsWithRegions returns all solar system names and their regions from the local SQLite DB
+func (a *App) ListSystemsWithRegions() ([]SystemRegion, error) {
+	if a.ssi == nil || a.ssi.db == nil {
+		return nil, errors.New("db not initialised")
+	}
+	var rows []SystemRegion
+	// mapSolarSystems has regionID; mapRegions has regionName
+	q := `SELECT s.solarSystemName AS system, r.regionName AS region
+		FROM mapSolarSystems s
+		JOIN mapRegions r ON r.regionID = s.regionID`
+	if err := a.ssi.db.Raw(q).Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+	return rows, nil
+}
diff --git a/frontend/src/components/RegionMap.tsx b/frontend/src/components/RegionMap.tsx
index 18ce64d..ca2a209 100644
--- a/frontend/src/components/RegionMap.tsx
+++ b/frontend/src/components/RegionMap.tsx
@@ -98,6 +98,25 @@ export const RegionMap = ({ regionName, focusSystem, isCompact = false, isWormho
   const [offRegionIndicators, setOffRegionIndicators] = useState<OffIndicator[]>([]);
   const [meanNeighborAngle, setMeanNeighborAngle] = useState<Record<string, number>>({});
   const [charLocs, setCharLocs] = useState<Array<{ character_id: number; character_name: string; solar_system_name: string }>>([]);
+  const [focusUntil, setFocusUntil] = useState<number | null>(null);
+
+  // When focusSystem changes, set an expiry 20s in the future
+  useEffect(() => {
+    if (focusSystem) {
+      setFocusUntil(Date.now() + 20000);
+    }
+  }, [focusSystem]);
+
+  // Timer to clear focus after expiry
+  useEffect(() => {
+    if (!focusUntil) return;
+    const id = setInterval(() => {
+      if (Date.now() > focusUntil) {
+        setFocusUntil(null);
+      }
+    }, 500);
+    return () => clearInterval(id);
+  }, [focusUntil]);
 
   useEffect(() => {
     const onKeyDown = async (e: KeyboardEvent) => {
@@ -700,27 +719,35 @@ export const RegionMap = ({ regionName, focusSystem, isCompact = false, isWormho
         })}
 
         {/* Highlight focused system */}
-        {focusSystem && positions[focusSystem] && (
-          <circle
-            cx={positions[focusSystem].x}
-            cy={positions[focusSystem].y}
-            r="15"
-            fill="none"
-            stroke="#a855f7"
-            strokeWidth="3"
-            strokeDasharray="5,5"
-            opacity="0.8"
-          >
-            <animateTransform
-              attributeName="transform"
-              attributeType="XML"
-              type="rotate"
-              from={`0 ${positions[focusSystem].x} ${positions[focusSystem].y}`}
-              to={`360 ${positions[focusSystem].x} ${positions[focusSystem].y}`}
-              dur="10s"
-              repeatCount="indefinite"
+        {focusSystem && focusUntil && Date.now() <= focusUntil && positions[focusSystem] && (
+          <g>
+            <circle
+              cx={positions[focusSystem].x}
+              cy={positions[focusSystem].y}
+              r="20"
+              fill="none"
+              stroke="#f472b6"
+              strokeWidth="4"
+              strokeDasharray="6,6"
+              opacity="0.95"
+              filter="url(#glow)"
+            >
+              <animate
+                attributeName="r"
+                values="18;24;18"
+                dur="1.8s"
+                repeatCount="indefinite"
+              />
+            </circle>
+            <circle
+              cx={positions[focusSystem].x}
+              cy={positions[focusSystem].y}
+              r="8"
+              fill="#f472b6"
+              opacity="0.8"
             />
-          </circle>
+            <text x={positions[focusSystem].x + 14} y={positions[focusSystem].y - 14} fontSize="10" fill="#ffffff" stroke="#0f172a" strokeWidth="2" paintOrder="stroke">{focusSystem}</text>
+          </g>
         )}
       </svg>
 
diff --git a/frontend/src/components/SearchDialog.tsx b/frontend/src/components/SearchDialog.tsx
index dee537f..5a51e75 100644
--- a/frontend/src/components/SearchDialog.tsx
+++ b/frontend/src/components/SearchDialog.tsx
@@ -3,7 +3,6 @@ import { useNavigate } from 'react-router-dom';
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog';
 import { Input } from '@/components/ui/input';
 import { AhoCorasick } from '@/lib/aho';
-import pb from '@/lib/pocketbase';
 
 interface SearchResult {
   system: string;
@@ -11,26 +10,22 @@ interface SearchResult {
 }
 
 async function loadAllSystems(): Promise<Array<SearchResult>> {
-  // Fetch system names with regions from PocketBase, paginated and minimal fields
-  const perPage = 1000;
-  let page = 1;
-  const out: Array<SearchResult> = [];
-  const seen = new Set<string>();
-  // loop pages until fewer than perPage items
-  while (true) {
-    const res = await pb.collection('regionview').getList(page, perPage, { fields: 'sysname,sysregion' });
-    for (const item of res.items as any[]) {
-      const system: string = item.sysname;
-      const region: string = item.sysregion;
-      if (!seen.has(system)) {
+  // Fetch from Go (Wails): local SQLite DB via App.ListSystemsWithRegions
+  try {
+    const list = await (window as any)?.go?.main?.App?.ListSystemsWithRegions?.();
+    if (Array.isArray(list)) {
+      const seen = new Set<string>();
+      const out: Array<SearchResult> = [];
+      for (const item of list) {
+        const system = String(item.system);
+        if (seen.has(system)) continue;
         seen.add(system);
-        out.push({ system, region });
+        out.push({ system, region: String(item.region) });
       }
+      return out;
     }
-    if (res.items.length < perPage) break;
-    page += 1;
-  }
-  return out;
+  } catch (_) { /* noop */ }
+  return [];
 }
 
 export const SearchDialog: React.FC = () => {
diff --git a/frontend/wails.json b/frontend/wails.json
new file mode 100644
index 0000000..0519ecb
--- /dev/null
+++ b/frontend/wails.json
@@ -0,0 +1 @@
+ 
\ No newline at end of file
diff --git a/frontend/wailsjs/go/main/App.d.ts b/frontend/wailsjs/go/main/App.d.ts
index 84cc0c6..27735f7 100644
--- a/frontend/wailsjs/go/main/App.d.ts
+++ b/frontend/wailsjs/go/main/App.d.ts
@@ -14,6 +14,8 @@ export function Greet(arg1:string):Promise<string>;
 
 export function ListCharacters():Promise<Array<main.CharacterInfo>>;
 
+export function ListSystemsWithRegions():Promise<Array<main.SystemRegion>>;
+
 export function PostRouteForAllByNames(arg1:string,arg2:Array<string>):Promise<void>;
 
 export function SetDestinationForAll(arg1:string,arg2:boolean,arg3:boolean):Promise<void>;
diff --git a/frontend/wailsjs/go/main/App.js b/frontend/wailsjs/go/main/App.js
index 6f49768..fa94113 100644
--- a/frontend/wailsjs/go/main/App.js
+++ b/frontend/wailsjs/go/main/App.js
@@ -26,6 +26,10 @@ export function ListCharacters() {
   return window['go']['main']['App']['ListCharacters']();
 }
 
+export function ListSystemsWithRegions() {
+  return window['go']['main']['App']['ListSystemsWithRegions']();
+}
+
 export function PostRouteForAllByNames(arg1, arg2) {
   return window['go']['main']['App']['PostRouteForAllByNames'](arg1, arg2);
 }
diff --git a/frontend/wailsjs/go/models.ts b/frontend/wailsjs/go/models.ts
index b3073b4..b951b4e 100644
--- a/frontend/wailsjs/go/models.ts
+++ b/frontend/wailsjs/go/models.ts
@@ -53,6 +53,20 @@ export namespace main {
 		    return a;
 		}
 	}
+	export class SystemRegion {
+	    system: string;
+	    region: string;
+	
+	    static createFrom(source: any = {}) {
+	        return new SystemRegion(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.system = source["system"];
+	        this.region = source["region"];
+	    }
+	}
 
 }