diff --git a/client/src/types.ts b/client/src/types.ts
index 8844d57..4a2afb4 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -23,4 +23,7 @@ export interface MCPServer {
   features?: string[];
   prerequisites?: string[];
   lastEnrichmentTime?: number;
+  githubLatestCommit?: string;
+  githubForks?: number;
+  licenseType?: string | null;
 }
\ No newline at end of file
diff --git a/server/src/lib/githubEnrichment.ts b/server/src/lib/githubEnrichment.ts
index 80a20cf..61d46ad 100644
--- a/server/src/lib/githubEnrichment.ts
+++ b/server/src/lib/githubEnrichment.ts
@@ -37,7 +37,7 @@ export interface EnrichedMcpServer extends McpServer {
   latest_commit_id?: string;
   fork_count?: number;
   owner_name?: string;
-  license_type?: string | null;
+  license_type?: string | undefined;
 }
 
 /**
@@ -115,7 +115,7 @@ export interface GithubRepoInfo {
   latest_commit_id: string;
   fork_count: number;
   owner_name: string;
-  license_type: string | null; // Will be null if no license information available
+  license_type: string | undefined; // Will be undefined if no license information available
 }
 
 /**
@@ -161,7 +161,7 @@ export async function fetchGithubInfo(githubUrl: string): Promise<GithubRepoInfo
       latest_commit_id: latestCommit.sha || '',
       fork_count: repoData.forks_count,
       owner_name: repoData.owner?.login || owner,
-      license_type: repoData.license?.spdx_id || null
+      license_type: repoData.license?.spdx_id
     };
   } catch (error) {
     console.error(`Error fetching repository information for ${githubUrl}:`, error);
@@ -395,7 +395,7 @@ export async function enrichServerData(server: McpServer, locale: string = 'en')
       enrichedServer.latest_commit_id = githubInfo.latest_commit_id;
       enrichedServer.fork_count = githubInfo.fork_count;
       enrichedServer.owner_name = githubInfo.owner_name;
-      enrichedServer.license_type = githubInfo.license_type || undefined;
+      enrichedServer.license_type = githubInfo.license_type;
     }
     
     // Cache the enriched data using locale-specific key
diff --git a/server/src/lib/mcpServers.ts b/server/src/lib/mcpServers.ts
index c8fc562..1d970dd 100644
--- a/server/src/lib/mcpServers.ts
+++ b/server/src/lib/mcpServers.ts
@@ -23,7 +23,13 @@ export interface McpServer {
   createdAt?: string;
   updatedAt?: string;
   hubId: string;
-  [key: string]: string | number | boolean | string[] | undefined;
+  isOfficialIntegration?: boolean;
+  isReferenceServer?: boolean;
+  isCommunityServer?: boolean;
+  githubLatestCommit?: string;
+  githubForks?: number;
+  licenseType?: string | null;
+  [key: string]: string | number | boolean | string[] | null | undefined;
 }
 
 // In-memory cache for MCP servers data - now keyed by locale
diff --git a/server/src/routes/hub.ts b/server/src/routes/hub.ts
index 91e8072..9e3d56d 100644
--- a/server/src/routes/hub.ts
+++ b/server/src/routes/hub.ts
@@ -187,13 +187,14 @@ router.post('/search_servers', async (req: Request, res: Response): Promise<void
     }
     
     // Sort servers so that isRecommended: true servers appear first
+    // Then sort by githubStars in descending order
     filteredServers.sort((a, b) => {
       // If a is recommended and b is not, a comes first
       if (a.isRecommended && !b.isRecommended) return -1;
       // If b is recommended and a is not, b comes first
       if (!a.isRecommended && b.isRecommended) return 1;
-      // If both have the same recommendation status, maintain original order
-      return 0;
+      // If both have the same recommendation status, sort by githubStars (descending)
+      return (b.githubStars || 0) - (a.githubStars || 0);
     });
 
     // Apply pagination if parameters are provided
@@ -231,7 +232,7 @@ router.post('/search_servers', async (req: Request, res: Response): Promise<void
     
     const filterInfoString = filterInfo ? `, ${filterInfo}` : '';
     
-    console.log(`v1/hub/search_servers Served filtered and sorted MCP servers data (recommended first) for locale: ${requestedLocale}${categoryKey ? `, category: ${categoryKey}` : ''}${filterInfoString}${searchInfo}${page !== undefined && size !== undefined ? `, page: ${page}, size: ${size}` : ''} at ${new Date().toISOString()}`);
+    console.log(`v1/hub/search_servers Served filtered and sorted MCP servers data (recommended first, then by GitHub stars) for locale: ${requestedLocale}${categoryKey ? `, category: ${categoryKey}` : ''}${filterInfoString}${searchInfo}${page !== undefined && size !== undefined ? `, page: ${page}, size: ${size}` : ''} at ${new Date().toISOString()}`);
   } catch (error) {
     console.error('Error serving filtered MCP servers:', error);
     res.status(500).json({ error: 'Internal server error' });