diff --git a/components/search.vue b/components/search.vue
index a85fb13..bf56db3 100644
--- a/components/search.vue
+++ b/components/search.vue
@@ -350,9 +350,7 @@ export default {
         getAppCategory,
         getAppEndpoint,
         getSearchLinks (app) {
-            if (typeof app.searchLinks === 'undefined') return []
-
-            return app.searchLinks
+            return app?.searchLinks || []
         },
         // Search priorities
         titleStartsWith (query, app) {
diff --git a/pages/index.vue b/pages/index.vue
index 6cf51aa..8307c53 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -92,11 +92,11 @@ export default {
             // Filter app list to leave out data not needed for search
             initialAppList: sortedAppList.map( app => {
 
-                let searchLinks = []
+                const searchLinks = allAppSearchLinks?.[app.slug] || []
 
-                if (typeof allAppSearchLinks[app.slug] !== 'undefined') {
-                    searchLinks = allAppSearchLinks[app.slug]
-                }
+                // if (typeof allAppSearchLinks[app.slug] !== 'undefined') {
+                //     searchLinks = allAppSearchLinks[app.slug]
+                // }
 
                 return {
                     name: app.name,
@@ -211,11 +211,7 @@ export default {
 
             this.fetchedAppList = fetchedLists.flat(1).map( app => {
 
-                let searchLinks = []
-
-                if (typeof this.allAppSearchLinks[app.slug] !== 'undefined') {
-                    searchLinks = this.allAppSearchLinks[app.slug]
-                }
+                const searchLinks = this.allAppSearchLinks?.[app.slug] || []
 
                 return {
                     ...app,