diff --git a/chrome/content/pb-overlay.js b/chrome/content/pb-overlay.js
index 8990d05..b68d3ed 100644
--- a/chrome/content/pb-overlay.js
+++ b/chrome/content/pb-overlay.js
@@ -425,7 +425,7 @@ var mailHopsDisplay =
   	if(!!city && !!state)
         displayText = city+', '+state;
     else if(!!city)  
-        displayText = city;
+        displayText = city+', '+countryCode;
   	else if(!!countryName)
   		displayText = countryName;
 
diff --git a/chrome/content/tb-overlay.js b/chrome/content/tb-overlay.js
index 7b8c251..abffc87 100644
--- a/chrome/content/tb-overlay.js
+++ b/chrome/content/tb-overlay.js
@@ -193,13 +193,13 @@ var mailHopsDisplay =
       for(var i=0; i<response.route.length;i++){
             //get the first hop location
             if(!gotFirst && !response.route[i].private && !response.route[i].client){
-              if(response.route[i].countryCode)
+              if(!!response.route[i].countryCode)
                 image='chrome://mailhops/content/images/flags/'+response.route[i].countryCode.toLowerCase()+'.png';
-              if(response.route[i].city)
+              if(!!response.route[i].city)
                 city=response.route[i].city;
-              if(response.route[i].state)
+              if(!!response.route[i].state)
                 state=response.route[i].state;
-              if(response.route[i].countryName)
+              if(!!response.route[i].countryName)
                 countryName=response.route[i].countryName;
               gotFirst=true;
             }
@@ -286,7 +286,7 @@ var mailHopsDisplay =
     if(!!city && !!state)
         displayText = city+', '+state;
     else if(!!city)  
-        displayText = city;
+        displayText = city+', '+countryCode;
     else if(!!countryName)
         displayText = countryName;