diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts
index 28c3feed..b2326db7 100644
--- a/packages/core.gbapp/services/GBDeployer.ts
+++ b/packages/core.gbapp/services/GBDeployer.ts
@@ -105,7 +105,10 @@ export class GBDeployer implements IGBDeployer {
    */
   public static async internalGetDriveClient(min: GBMinInstance) {
     let token;
-    if (min['cacheToken']) {
+
+    // TODO: Add expiration logic.  
+
+    if (min['cacheToken'] && null) {
       return min['cacheToken'];
     } else {
 
diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts
index d14431a8..a3530340 100644
--- a/packages/kb.gbapp/services/KBService.ts
+++ b/packages/kb.gbapp/services/KBService.ts
@@ -289,9 +289,12 @@ export class KBService implements IGBKBService {
       }
     }
 
+    let key = instance.searchKey ? instance.searchKey: 
+      GBServer.globals.minBoot.instance.searchKey;
+
     // No direct match found, so Search is used.
 
-    if (instance.searchKey !== null && GBConfigService.get('STORAGE_DIALECT') === 'mssql') {
+    if (key !== null && GBConfigService.get('STORAGE_DIALECT') === 'mssql') {
       interface SearchResults {
         instanceId: number;
         questionId: number;
@@ -304,7 +307,7 @@ export class KBService implements IGBKBService {
       }
 
       const client = new SearchClient<any>('https://' + instance.searchHost, 'azuresql-index', {
-        key: instance.searchKey
+        key: key
       } as any);
 
       const results = await client.search(query, {