--- location.tpl-orig.php	2010-04-24 18:54:29.000000000 -0400
+++ location.tpl.php	2010-04-24 18:55:19.000000000 -0400
@@ -9,20 +9,15 @@
 ?></div>
 <?php }?>
 <?php
-  if ($city || $province || $postal_code) {
-    $city_province_postal = array();
-
-    if ($city) {
-      $city_province_postal[] = '<span class="locality">'. $city .'</span>';
-    }
-    if ($province) {
-      $city_province_postal[] = '<span class="region">'. $province .'</span>';
-    }
-    if ($postal_code) {
-      $city_province_postal[] = '<span class="postal-code">'. $postal_code .'</span>';
-    }
-
-    echo implode(', ', $city_province_postal);
+  if ($city) {
+    echo '<span class="locality">'. $city .'</span>';
+    if ($province) echo ', ';
+  }
+  if ($province) {
+    echo '<span class="region">'. $province_name .'</span> ';
+  }
+  if ($postal_code) {
+    echo ' <span class="postal-code">'. $postal_code .'</span>';
   }
 ?>
 <?php if ($country_name) { ?>