diff --git a/eslint.config.js b/eslint.config.js
index 338d2cdbc..c1612e1ee 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -194,7 +194,7 @@ export default defineConfig([
             '**/*.min.mjs',
             '**/socket.io.js',
             '**/dist/*.js',
-            'src/phoenix/test/**',
+            'src/phoenix/**',
             'src/gui/src/lib/**',
             'src/gui/dist/**',
         ],
diff --git a/src/backend/src/modules/puterai/AIChatService.js b/src/backend/src/modules/puterai/AIChatService.js
index 2128b8bbd..5ea4b6968 100644
--- a/src/backend/src/modules/puterai/AIChatService.js
+++ b/src/backend/src/modules/puterai/AIChatService.js
@@ -733,7 +733,7 @@ class AIChatService extends BaseService {
             if ( target_model.id.startsWith('openrouter:') || target_model.id.startsWith('togetherai:') ) {
                 [aiProvider, modelToSearch] = target_model.id.replace('openrouter:', '').replace('togetherai:', '').toLowerCase().split('/');
             } else {
-                [aiProvider, modelToSearch] = target_model.provider.toLowerCase(), target_model.id.toLowerCase();
+                [aiProvider, modelToSearch] = target_model.provider.toLowerCase().replace('gemini', 'google').replace('openai-completion', 'openai'), target_model.id.toLowerCase();
             }
 
             const potentialMatches = models.filter(model => {
@@ -741,7 +741,7 @@ class AIChatService extends BaseService {
                     `togetherai:${aiProvider}/${modelToSearch}`, ...(target_model.aliases?.map((alias) => [`openrouter:${aiProvider}/${alias}`,
                         `togetherai:${aiProvider}/${alias}`])?.flat() ?? [])];
 
-                return !possibleModelNames.find(possibleName => model.id.toLowerCase() === possibleName);
+                return !!possibleModelNames.find(possibleName => model.id.toLowerCase() === possibleName);
             }).slice(0, MAX_FALLBACKS);
 
             this.modules.kv.set(`${this.kvkey}:fallbacks:${model}`, potentialMatches);