diff --git a/frontend/src/FilterManager.jsx b/frontend/src/FilterManager.jsx
index c66f674..ee3899b 100644
--- a/frontend/src/FilterManager.jsx
+++ b/frontend/src/FilterManager.jsx
@@ -806,8 +806,8 @@ function FilterManager() {
     
     const serverDns = matchedServer?.dns || matchedServer?.hostName || selectedServer.name || '';
     const serverId = matchedServer?.id || matchedServer?.ip || selectedServer.id || selectedServer.name || '';
-    const serverCountry = matchedServer?.country || '';
-    const serverProvider = matchedServer?.provider || '';
+    const serverCountry = matchedServer?.country || selectedServer.country || '';
+    const serverProvider = matchedServer?.provider || selectedServer.provider || '';
     
     const gws = [];