diff --git a/mod/directory.php b/mod/directory.php
index fa328462c..6d066a21b 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -210,7 +210,7 @@ function directory_content(&$a) {
 							$location .= $rr['region'];
 						}
 						if(strlen($rr['country'])) {
-							if(strlen($details))
+							if(strlen($location))
 								$location .= ', ';
 							$location .= $rr['country'];
 						}
@@ -286,7 +286,6 @@ function directory_content(&$a) {
 							'hash' => $rr['hash'],
 							'alttext' => $rr['name'] . ((local_channel() || remote_channel()) ? ' ' . $rr['address'] : ''),
 							'name' => $rr['name'],
-							'details' => $details,
 							'age' => $age,
 							'age_label' => t('Age:'),
 							'profile' => $profile,
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index 98ec25e23..6407f1edd 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -41,9 +41,9 @@
 			</div>
 			{{/if}}
 
-			{{if $entry.details}}
+			{{if $entry.location}}
 			<div class="contact-info-element">
-				<span class="contact-info-label">{{$entry.location}}</span> {{$entry.details}}
+				<span class="contact-info-label">{{$entry.location_label}}</span> {{$entry.location}}
 			</div>
 			{{/if}}